Changeset 114 for trunk/src

Timestamp:

Oct 20, 2005, 8:47:25 PM (19 years ago)

Author:

dkearney

Message:

updates to RpUnits to reduce memory leaks
created copy constructors, destructors, and copy assignment operators
for Units classes. removed conv as a data member and removed several
constructors. removed prev & next pointers from conversion class.
this removes linked list feature from conversion class which was not
being used. this update does not fix python's problem with performing
conversion between RpUnits objects or the allow for the recognition of
/cm3 as an object related to cm3.

also removed some outdated files rappture_interface.h, rappture_interface.c.
RpDict?.cc has been moved into RpDict?.h in previous checkins to reduce
dependencies on include files.

Location:

trunk/src

Files:

• cee/rappture_interface.c (deleted)
• core/RpDict.cc (deleted)
• core/RpUnits.cc (modified) (9 diffs)

trunk/src/core/RpUnits.cc

@@ -433 +433 @@
                   const RpUnits* to,
                   double (*convForwFxnPtr)(double),
-                  double (*convBackFxnPtr)(double)) {
-
-    RpUnits* conv = new RpUnits(    from,
-                                    to,
-                                    convForwFxnPtr,
-                                    convBackFxnPtr,
-                                    NULL,
-                                    NULL);
-
-    return conv;
+                  double (*convBackFxnPtr)(double)  ) {
+
+    // this is kinda the wrong way to get the job done...
+    // how do we only create 1 conversion object and share it between atleast two RpUnits
+    // objs so that when the RpUnits objs are deleted, we are not trying to delete already
+    // deleted memory.
+    // so for the sake of safety we get the following few lines of code.
+
+    conversion* conv1 = NULL;
+    conversion* conv2 = NULL;
+
+    conv1 = new conversion (from,to,convForwFxnPtr,convBackFxnPtr);
+    conv2 = new conversion (from,to,convForwFxnPtr,convBackFxnPtr);
+
+    from->connectConversion(conv1);
+    to->connectConversion(conv2);
+
+    return NULL;
 }
 
@@ -451 +459 @@
                   double (*convBackFxnPtr)(double,double)) {
 
-    RpUnits* conv = new RpUnits(    from,
-                                    to,
-                                    convForwFxnPtr,
-                                    convBackFxnPtr,
-                                    NULL,
-                                    NULL);
-
-    return conv;
+    // this is kinda the wrong way to get the job done...
+    // how do we only create 1 conversion object and share it between atleast two RpUnits
+    // objs so that when the RpUnits objs are deleted, we are not trying to delete already
+    // deleted memory.
+    // so for the sake of safety we get the following few lines of code.
+
+    conversion* conv1 = NULL;
+    conversion* conv2 = NULL;
+
+    conv1 = new conversion (from,to,convForwFxnPtr,convBackFxnPtr);
+    conv2 = new conversion (from,to,convForwFxnPtr,convBackFxnPtr);
+
+    from->connectConversion(conv1);
+    to->connectConversion(conv2);
+
+    return NULL;
 }
 
@@ -469 +485 @@
                   void* convBackData) {
 
-    RpUnits* conv = new RpUnits(    from,
-                                    to,
-                                    convForwFxnPtr,
-                                    convForwData,
-                                    convBackFxnPtr,
-                                    convBackData,
-                                    NULL,
-                                    NULL);
-
-    return conv;
+    // this is kinda the wrong way to get the job done...
+    // how do we only create 1 conversion object and share it between atleast two RpUnits
+    // objs so that when the RpUnits objs are deleted, we are not trying to delete already
+    // deleted memory.
+    // so for the sake of safety we get the following few lines of code.
+
+    conversion* conv1 = NULL;
+    conversion* conv2 = NULL;
+
+    conv1 = new conversion (from,to,convForwFxnPtr,convForwData,convBackFxnPtr,convBackData);
+    conv2 = new conversion (from,to,convForwFxnPtr,convForwData,convBackFxnPtr,convBackData);
+
+    from->connectConversion(conv1);
+    to->connectConversion(conv2);
+
+    return NULL;
 }
 
@@ -630 +652 @@
     const RpUnits* basis = getBasis();
     double retVal = *value;
-    int convResult = 0;
+    int convResult = 1;
 
     if (basis == NULL) {
@@ -644 +666 @@
     }
 
-    if ( (convResult == 1) ) {
+    if ( (convResult == 0) ) {
         *value = retVal;
     }
@@ -1206 +1228 @@
     // check if the list was created previously. if not, start the list
     if (head == 0) {
-        head = new unit(units,exponent,basis,NULL);
+        head = new unit(units,exponent,basis,NULL,NULL);
         return;
     }
 
     // now add a new node at the beginning of the list:
-    p = new unit(units,exponent,basis,head);
+    p = new unit(units,exponent,basis,NULL,head);
     head->prev = p;
     head = p;
@@ -1343 +1365 @@
 
 
-void 
-RpUnits::connectConversion(const RpUnits* myRpUnit) {
-
-    convEntry* p = myRpUnit->convList;
+void
+RpUnits::connectConversion(conversion* conv) const {
+
+    convEntry* p = convList;
 
     if (p == NULL) {
-        myRpUnit->convList = new convEntry (this->conv,NULL,NULL);
+        convList = new convEntry (conv,NULL,NULL);
     }
     else {
@@ -1356 +1378 @@
         }
 
-        p->next = new convEntry (this->conv,p,NULL);
+        p->next = new convEntry (conv,p,NULL);
     }
 
@@ -1363 +1385 @@
 // return codes: 0 success, anything else is error
 int
-RpUnits::addPresets (std::string group) {
+RpUnits::addPresets (const std::string group) {
     int retVal = -1;
     if (group.compare("all") == 0) {