From b6bb1d7789258dc8659684365d0741cf0c77b4cf Mon Sep 17 00:00:00 2001 From: sec Date: Sat, 29 Mar 1997 02:02:37 +0000 Subject: [PATCH] Fixed a bug, the ids were being set to the metrics which couldn't be instrumented (due to an error); since the id wasn't set it was never being removed from the pending queu. --- paradyn/src/DMthread/DMmain.C | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/paradyn/src/DMthread/DMmain.C b/paradyn/src/DMthread/DMmain.C index 26898ce..2afe8ce 100644 --- a/paradyn/src/DMthread/DMmain.C +++ b/paradyn/src/DMthread/DMmain.C @@ -266,8 +266,8 @@ void DMenableResponse(DM_enableType &enable,vector &successful){ (*response)[i].m_id = mis[i]->getMetricHandle(); (*response)[i].r_id = mis[i]->getFocusHandle(); (*response)[i].metric_name = mis[i]->getMetricName(); - (*response)[i].metric_units = metricptr->getUnits(); (*response)[i].focus_name = mis[i]->getFocusName(); + (*response)[i].metric_units = metricptr->getUnits(); (*response)[i].units_type = metricptr->getUnitsType(); // update the persistence flags: the OR of new & previous values @@ -289,7 +289,20 @@ void DMenableResponse(DM_enableType &enable,vector &successful){ } else { // was not successfully enabled (*response)[i].successfully_enabled = false; + (*response)[i].mi_id = mis[i]->getHandle(); + (*response)[i].m_id = mis[i]->getMetricHandle(); + (*response)[i].r_id = mis[i]->getFocusHandle(); + (*response)[i].metric_name = mis[i]->getMetricName(); + (*response)[i].focus_name = mis[i]->getFocusName(); } + +// if(mis[i]) { +// (*response)[i].mi_id = mis[i]->getHandle(); +// (*response)[i].m_id = mis[i]->getMetricHandle(); +// (*response)[i].r_id = mis[i]->getFocusHandle(); +// (*response)[i].metric_name = mis[i]->getMetricName(); +// (*response)[i].focus_name = mis[i]->getFocusName(); +// } } // make response call -- 1.8.3.1