diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-29 02:14:18 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-29 02:14:18 +0000 |
| commit | a4c7b5bf3674abb10223a14dd895db985d01fdfc (patch) | |
| tree | 60e49572cf9281cf487f8477d0ad796551910e48 | |
| parent | 993ff1e0a7f1b391dc714eda5d570404a20560ad (diff) | |
| download | ATCD-a4c7b5bf3674abb10223a14dd895db985d01fdfc.tar.gz | |
Thu Oct 29 02:12:40 UTC 2009 Yan Dai <dai_y@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/Monitor/Monitor_Impl.cpp | 1 |
4 files changed, 17 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1d4f8069085..8a4e321aa3f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Thu Oct 29 02:12:40 UTC 2009 Yan Dai <dai_y@ociweb.com> + + * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp: + * tao/Monitor/Monitor_Impl.cpp: + + Fixed bugs that did not initialize and set last in Numric data. + + * orbsvcs/tests/Notify/MC/test_monitor.cpp: + + Corrected some expected values. + Wed Oct 28 23:27:02 UTC 2009 Yan Dai <dai_y@ociweb.com> * MPC/config/negotiate_codesets.mpb: diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp index 8edea85d8e2..2b3648468df 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp @@ -237,6 +237,7 @@ NotificationServiceMonitor_i::get_data ( num.sum_of_squares = 0; num.minimum = 0; num.maximum = 0; + num.last = 0; } else { diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp index fa3c66cbb6d..5581889ea8b 100644 --- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp @@ -129,7 +129,7 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc) str = this->base_ + NotifyMonitoringExt::EventChannelQueueElementCount; data = nsm_->get_statistic(str.c_str ()); num = data->data_union.num (); - if (num.dlist[0].value != 1) + if (num.dlist[0].value != 0) ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be no events queued\n")); brain_dump ("Running Consumer"); @@ -141,13 +141,14 @@ MonitorTestInterface_i::running (MonitorTestInterface::Which proc) str = this->base_ + NotifyMonitoringExt::EventChannelSupplierCount; data = nsm_->get_statistic(str.c_str ()); num = data->data_union.num (); - if (num.dlist[0].value != 0) + + if (num.dlist[0].value != 1) ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be only one Supplier\n")); str = this->base_ + NotifyMonitoringExt::EventChannelSupplierAdminCount; data = nsm_->get_statistic(str.c_str ()); num = data->data_union.num (); - if (num.dlist[0].value != 0) + if (num.dlist[0].value != 1) ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be only one SupplierAdmin\n")); brain_dump ("Running Supplier"); diff --git a/TAO/tao/Monitor/Monitor_Impl.cpp b/TAO/tao/Monitor/Monitor_Impl.cpp index 7246b5e5513..8823bb9d33a 100644 --- a/TAO/tao/Monitor/Monitor_Impl.cpp +++ b/TAO/tao/Monitor/Monitor_Impl.cpp @@ -178,6 +178,7 @@ TAO_Monitor::get_monitor_data ( num.count = static_cast<CORBA::ULong> (monitor->count ()); num.minimum = monitor->minimum_sample (); num.maximum = monitor->maximum_sample (); + num.last = monitor->last_sample (); num.dlist.length (1); num.dlist[0].value = monitor->last_sample (); Monitor_Control_Types::Data d (monitor->type ()); |