summaryrefslogtreecommitdiff
path: root/ACE/ace/Monitor_Control
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-09-17 07:52:52 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-09-17 07:52:52 +0000
commite60a5d9d9b55bcb774031e36f9ea96a5a8a6045d (patch)
tree6e47dd26396eea92224f8ecd241b3c96f7531c42 /ACE/ace/Monitor_Control
parent447b29bb6ee55ceb53aca914041c801baf05baa9 (diff)
downloadATCD-e60a5d9d9b55bcb774031e36f9ea96a5a8a6045d.tar.gz
Removed trailing whitespaces
Diffstat (limited to 'ACE/ace/Monitor_Control')
-rw-r--r--ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp20
-rw-r--r--ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp4
-rw-r--r--ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp6
-rw-r--r--ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp4
-rw-r--r--ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp2
-rw-r--r--ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp2
-rw-r--r--ACE/ace/Monitor_Control/Monitor_Group.cpp6
-rw-r--r--ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp2
-rw-r--r--ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp2
-rw-r--r--ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp6
-rw-r--r--ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp4
-rw-r--r--ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp42
-rw-r--r--ACE/ace/Monitor_Control/Windows_Monitor.cpp10
-rw-r--r--ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp2
14 files changed, 56 insertions, 56 deletions
diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
index b76bb07aea4..d79247a4466 100644
--- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
@@ -53,16 +53,16 @@ namespace ACE
{
ACE_UINT64 count = 0;
int fd = socket (AF_INET, SOCK_DGRAM, 0);
-
- if (fd == -1)
+
+ if (fd == -1)
{
ACE_ERROR ((LM_ERROR, ACE_TEXT ("socket failed\n")));
return;
}
struct ifaddrs *ifa, *ifap;
-
- if (getifaddrs (&ifap) < 0)
+
+ if (getifaddrs (&ifap) < 0)
{
ACE_ERROR ((LM_ERROR, ACE_TEXT ("getifaddrs failed\n")));
close (fd);
@@ -70,15 +70,15 @@ namespace ACE
}
char *p = 0;
-
- for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next)
+
+ for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next)
{
if (p && strcmp (p, ifa->ifa_name) == 0)
{
continue;
}
-
- p = ifa->ifa_name;
+
+ p = ifa->ifa_name;
#if defined (__OpenBSD__)
struct ifreq ifdr;
@@ -94,7 +94,7 @@ namespace ACE
#else
strncpy (ifdr.ifdr_name, ifa->ifa_name, sizeof (ifdr));
#endif
- if (ioctl (fd, SIOCGIFDATA, &ifdr) == -1)
+ if (ioctl (fd, SIOCGIFDATA, &ifdr) == -1)
{
ACE_ERROR ((LM_ERROR, ACE_TEXT ("SIOCGIFDATA failed\n")));
}
@@ -125,7 +125,7 @@ namespace ACE
freeifaddrs (ifap);
close (fd);
-
+
value = count;
}
}
diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp
index 3838610b5a1..7950244762c 100644
--- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp
@@ -35,7 +35,7 @@ namespace ACE
Bytes_Received_Monitor::update (void)
{
this->update_i ();
-
+
/// On some platforms, value_ is an ACE_UINT64.
this->receive (static_cast<double> (this->value_));
}
@@ -45,7 +45,7 @@ namespace ACE
{
return Bytes_Received_Monitor::default_name_;
}
-
+
void
Bytes_Received_Monitor::clear_i (void)
{
diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
index 4f2ecf47d31..e4aa4f2af59 100644
--- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
@@ -26,7 +26,7 @@ namespace ACE
, Solaris_Network_Interface_Monitor (ACE_TEXT ("obytes"))
#elif defined (__FreeBSD__) || defined (__Lynx__)
, FreeBSD_Network_Interface_Monitor (ACE_TEXT ("obytes"))
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
+#elif defined (__NetBSD__) || defined (__OpenBSD__)
, BSD_Network_Interface_Monitor (ACE_TEXT ("obytes"))
#endif
{}
@@ -35,7 +35,7 @@ namespace ACE
Bytes_Sent_Monitor::update (void)
{
this->update_i ();
-
+
/// On some platforms, value_ is an ACE_UINT64.
this->receive (static_cast<double> (this->value_));
}
@@ -45,7 +45,7 @@ namespace ACE
{
return Bytes_Sent_Monitor::default_name_;
}
-
+
void
Bytes_Sent_Monitor::clear_i (void)
{
diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
index afede0fc5fb..047062bf6fd 100644
--- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp
@@ -85,7 +85,7 @@ namespace ACE
{
return CPU_Load_Monitor::default_name_;
}
-
+
void
CPU_Load_Monitor::clear_i (void)
{
@@ -96,7 +96,7 @@ namespace ACE
this->init ();
this->Monitor_Base::clear_i ();
}
-
+
void
CPU_Load_Monitor::init (void)
{
diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
index ddaf2cbc91d..9cbc0c15d66 100644
--- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
@@ -70,7 +70,7 @@ namespace ACE
{
this->init ();
}
-
+
void
Linux_Network_Interface_Monitor::init (void)
{
diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
index 1647430c90c..179c6c144ef 100644
--- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp
@@ -60,7 +60,7 @@ namespace ACE
{
return Memory_Usage_Monitor::default_name_;
}
-
+
void
Memory_Usage_Monitor::clear_i (void)
{
diff --git a/ACE/ace/Monitor_Control/Monitor_Group.cpp b/ACE/ace/Monitor_Control/Monitor_Group.cpp
index c5329a4d1dc..dd40cacf478 100644
--- a/ACE/ace/Monitor_Control/Monitor_Group.cpp
+++ b/ACE/ace/Monitor_Control/Monitor_Group.cpp
@@ -36,19 +36,19 @@ namespace ACE
{
/// No-op, should always call update().
}
-
+
void
Monitor_Group::receive (size_t /* data */)
{
/// No-op, should always call update().
}
-
+
void
Monitor_Group::receive (const Monitor_Control_Types::NameList& /* data */)
{
/// No-op, should always call update().
}
-
+
void
Monitor_Group::clear (void)
{
diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
index 318afcfc026..bcbd73329cc 100644
--- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
@@ -18,7 +18,7 @@ namespace ACE
{
/// No-op.
}
-
+
void
Null_Network_Interface_Monitor::clear_impl (void)
{
diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
index 8aba3d75ccf..b082dfe759e 100644
--- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp
@@ -78,7 +78,7 @@ namespace ACE
{
return Num_Threads_Monitor::default_name_;
}
-
+
void
Num_Threads_Monitor::clear_i (void)
{
diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
index b8ba8fbc8b8..19314fb58cd 100644
--- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp
@@ -26,7 +26,7 @@ namespace ACE
, Solaris_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
#elif defined (__FreeBSD__) || defined (__Lynx__)
, FreeBSD_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
+#elif defined (__NetBSD__) || defined (__OpenBSD__)
, BSD_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
#endif
{}
@@ -35,7 +35,7 @@ namespace ACE
Packets_Received_Monitor::update (void)
{
this->update_i ();
-
+
/// On some platforms, value_ is an ACE_UINT64.
this->receive (static_cast<double> (this->value_));
}
@@ -45,7 +45,7 @@ namespace ACE
{
return Packets_Received_Monitor::default_name_;
}
-
+
void
Packets_Received_Monitor::clear_i (void)
{
diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp
index 13b3725af6d..6792b94b950 100644
--- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp
@@ -35,7 +35,7 @@ namespace ACE
Packets_Sent_Monitor::update (void)
{
this->update_i ();
-
+
/// On some platforms, value_ is an ACE_UINT64.
this->receive (static_cast<double> (this->value_));
}
@@ -45,7 +45,7 @@ namespace ACE
{
return Packets_Sent_Monitor::default_name_;
}
-
+
void
Packets_Sent_Monitor::clear_i (void)
{
diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
index 8e41a7b4f2c..86170fd6c6d 100644
--- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
@@ -28,18 +28,18 @@ namespace ACE
this->access_kstats (this->value_);
this->value_ -= this->start_;
}
-
+
void
Solaris_Network_Interface_Monitor::clear_impl (void)
{
this->init ();
}
-
+
void
Solaris_Network_Interface_Monitor::init (void)
{
unsigned long i;
-
+
for (i = 0UL; i < MAX_LO_INTERFACES; ++i)
{
this->value_array_lo_[i] = 0UL;
@@ -52,7 +52,7 @@ namespace ACE
this->access_kstats (this->start_);
}
-
+
void
Solaris_Network_Interface_Monitor::access_kstats (
ACE_UINT64 &which_member)
@@ -80,24 +80,24 @@ namespace ACE
{
continue;
}
-
+
unsigned long ks_instance = this->kstat_->ks_instance;
-
+
if (ACE_OS::strcmp (this->kstat_->ks_module, "lo") == 0)
{
/// Interfaces 'lo' have only packet counters.
- if (this->lookup_str_ == ACE_TEXT ("obytes")
+ if (this->lookup_str_ == ACE_TEXT ("obytes")
|| this->lookup_str_ == ACE_TEXT ("rbytes"))
{
continue;
}
-
+
status = this->check_ks_module (ks_instance,
MAX_LO_INTERFACES,
"MAX_LO_INTERFACES",
this->value_array_lo_,
which_member);
-
+
if (status == -1)
{
/// Unrecoverable error, diagnostic already output.
@@ -108,7 +108,7 @@ namespace ACE
{
/// The kstat_id changed underneath us, start over.
break;
- }
+ }
}
else if (ACE_OS::strcmp (this->kstat_->ks_module, "hme") == 0
|| ACE_OS::strcmp (this->kstat_->ks_module, "bge") == 0)
@@ -118,7 +118,7 @@ namespace ACE
"MAX_HME_INTERFACES",
this->value_array_hme_,
which_member);
-
+
if (status == -1)
{
/// Unrecoverable error, diagnostic already output.
@@ -132,11 +132,11 @@ namespace ACE
}
}
}
-
+
if (this->kstat_)
{
this->kstat_id_ = kstat_chain_update (this->kstats_);
-
+
if (! this->kstat_id_ > 0)
{
ACE_ERROR ((LM_ERROR, "kstat is is not > 0.\n"));
@@ -148,7 +148,7 @@ namespace ACE
break;
}
}
-
+
status = kstat_close (this->kstats_);
if (status != 0)
@@ -157,7 +157,7 @@ namespace ACE
ACE_TEXT ("closing kstats file failed\n")));
}
}
-
+
int
Solaris_Network_Interface_Monitor::check_ks_module (
const unsigned long ks_instance,
@@ -187,30 +187,30 @@ namespace ACE
/// This return value restarts the walk as described above.
return 1;
}
-
+
kstat_named_t *value =
(kstat_named_t *) kstat_data_lookup (
this->kstat_,
ACE_TEXT_ALWAYS_CHAR (this->lookup_str_.rep ()));
-
+
if (value == 0)
{
/// Just return and let the calling FOR loop advance.
return 0;
}
-
+
if (value->data_type != KSTAT_DATA_UINT32)
{
ACE_ERROR_RETURN ((LM_ERROR,
"Wrong data type.\n"),
-1);
}
-
- /// Guard against overflow.
+
+ /// Guard against overflow.
value_array[ks_instance] +=
value->value.ui32
- static_cast<ACE_UINT32> (value_array[ks_instance]);
-
+
which_member += value_array[ks_instance];
return 0;
diff --git a/ACE/ace/Monitor_Control/Windows_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Monitor.cpp
index b111b511598..4177eb87ed7 100644
--- a/ACE/ace/Monitor_Control/Windows_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Windows_Monitor.cpp
@@ -21,27 +21,27 @@ namespace ACE
{
this->init ();
}
-
+
void
Windows_Monitor::update_i (void)
{
PdhCollectQueryData (this->query_);
PDH_FMT_COUNTERVALUE pdh_value;
-
+
PdhGetFormattedCounterValue (this->counter_,
PDH_FMT_DOUBLE,
0,
&pdh_value);
-
+
this->value_ = pdh_value.doubleValue;
}
-
+
void
Windows_Monitor::clear_impl (void)
{
this->init ();
}
-
+
void
Windows_Monitor::init (void)
{
diff --git a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
index f674078b69a..7bd77a67637 100644
--- a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
+++ b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
@@ -88,7 +88,7 @@ namespace ACE
this->value_ += (*current_instance)->value_;
}
}
-
+
void
Windows_Multi_Instance_Monitor::clear_impl (void)
{