diff --git a/EventFilter/StorageManager/interface/ResourceMonitorCollection.h b/EventFilter/StorageManager/interface/ResourceMonitorCollection.h index 1f10dd6032c75..757f3b840c0bd 100644 --- a/EventFilter/StorageManager/interface/ResourceMonitorCollection.h +++ b/EventFilter/StorageManager/interface/ResourceMonitorCollection.h @@ -1,4 +1,4 @@ -// $Id: ResourceMonitorCollection.h,v 1.18 2009/09/18 15:17:16 mommsen Exp $ +// $Id: ResourceMonitorCollection.h,v 1.19 2009/10/13 15:08:33 mommsen Exp $ /// @file: ResourceMonitorCollection.h #ifndef StorageManager_ResourceMonitorCollection_h @@ -30,8 +30,8 @@ namespace stor { * A collection of MonitoredQuantities related to resource usages * * $Author: mommsen $ - * $Revision: 1.18 $ - * $Date: 2009/09/18 15:17:16 $ + * $Revision: 1.19 $ + * $Date: 2009/10/13 15:08:33 $ */ class ResourceMonitorCollection : public MonitorCollection @@ -143,9 +143,6 @@ namespace stor { xdata::Vector _totalDiskSpace; // total disk space xdata::Vector _usedDiskSpace; // used disk space - // Unused status string from old SM - xdata::String _progressMarker; - }; } // namespace stor diff --git a/EventFilter/StorageManager/src/ResourceMonitorCollection.cc b/EventFilter/StorageManager/src/ResourceMonitorCollection.cc index 8ccbabd78765e..72da1c8e2f526 100644 --- a/EventFilter/StorageManager/src/ResourceMonitorCollection.cc +++ b/EventFilter/StorageManager/src/ResourceMonitorCollection.cc @@ -1,4 +1,4 @@ -// $Id: ResourceMonitorCollection.cc,v 1.24 2009/10/13 10:31:07 mommsen Exp $ +// $Id: ResourceMonitorCollection.cc,v 1.25 2009/10/13 16:52:59 mommsen Exp $ /// @file: ResourceMonitorCollection.cc #include @@ -31,8 +31,7 @@ _alarmHandler(ah), _numberOfCopyWorkers(-1), _numberOfInjectWorkers(-1), _nLogicalDisks(0), -_latchedSataBeastStatus(-1), -_progressMarker( "unused" ) +_latchedSataBeastStatus(-1) { // Initialize values to avoid sending alarms // before we've reach the ready state @@ -141,7 +140,6 @@ void ResourceMonitorCollection::do_reset() void ResourceMonitorCollection::do_appendInfoSpaceItems(InfoSpaceItems& infoSpaceItems) { - infoSpaceItems.push_back(std::make_pair("progressMarker", &_progressMarker)); infoSpaceItems.push_back(std::make_pair("copyWorkers", &_copyWorkers)); infoSpaceItems.push_back(std::make_pair("injectWorkers", &_injectWorkers)); infoSpaceItems.push_back(std::make_pair("sataBeastStatus", &_sataBeastStatus));