Changeset 15562 for trunk/psModules/src/objects/pmModelClass.c

Timestamp:

Nov 9, 2007, 3:09:20 PM (19 years ago)

Author:

eugene

Message:

updating all changes from from eam_branch_20071023

File:

• trunk/psModules/src/objects/pmModelClass.c (modified) (9 diffs)

trunk/psModules/src/objects/pmModelClass.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 00:09:05 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-10 01:09:20 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -57 +57 @@
 static void ModelClassFree (pmModelClass *modelClass)
 {
-
     if (modelClass == NULL)
         return;
@@ -70 +69 @@
 }
 
+bool psMemCheckModelClass(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) ModelClassFree);
+}
+
 void pmModelClassAdd (pmModelClass *model)
 {
     if (models == NULL) {
-        pmModelClassInit ();
+        pmModelClassInit();
     }
 
@@ -85 +90 @@
 {
     // if we do not need to init, return false;
-    if (models != NULL)
+    if (models != NULL) {
         return false;
+    }
 
     int Nnew = sizeof (defaultModels) / sizeof (pmModelClass);
@@ -100 +106 @@
 pmModelClass *pmModelClassSelect (pmModelType type)
 {
+    if (models == NULL) {
+        pmModelClassInit();
+    }
+
     if ((type < 0) || (type >= Nmodels)) {
         psError(PS_ERR_UNKNOWN, true, "Undefined pmModelType");
@@ -111 +121 @@
     psFree (models);
     models = NULL;
+    Nmodels = 0;
     return;
 }
@@ -116 +127 @@
 psS32 pmModelClassParameterCount (pmModelType type)
 {
+    if (models == NULL) {
+        pmModelClassInit();
+    }
+
     if ((type < 0) || (type >= Nmodels)) {
         psError(PS_ERR_UNKNOWN, true, "Undefined pmModelType");
@@ -125 +140 @@
 psS32 pmModelClassGetType (char *name)
 {
+    if (models == NULL) {
+        pmModelClassInit();
+    }
+
     for (int i = 0; i < Nmodels; i++) {
         if (!strcmp(models[i].name, name)) {
@@ -135 +154 @@
 char *pmModelClassGetName (pmModelType type)
 {
+    if (models == NULL) {
+        pmModelClassInit();
+    }
+
     if ((type < 0) || (type >= Nmodels)) {
         psError(PS_ERR_UNKNOWN, true, "Undefined pmModelType");