Changeset 10656

Timestamp:

Dec 12, 2006, 9:37:18 AM (20 years ago)

Author:

eugene

Message:

added some debugging info; fixed memory error

Location:

trunk/Ohana/src/opihi/pcontrol

Files:

• CheckSystem.c (modified) (1 diff)
• StackOps.c (modified) (11 diffs)

trunk/Ohana/src/opihi/pcontrol/CheckSystem.c

@@ -66 +66 @@
 
     // don't run the system checks if RunSystem is FALSE
+    // XXX stop should not suspend all checks: we should continue
+    // to harvest completed jobs and migrate idle machines to down
     if (!RunSystem) {
       usleep (50000); // idle if RunSystem is FALSE

trunk/Ohana/src/opihi/pcontrol/StackOps.c

@@ -11 +11 @@
  */
 
+# define DEBUG 0
+
+void PrintStackInfo (Stack *stack, char *func) {
+
+  if (!DEBUG) return;
+  fprintf (stderr, "%s: %p  ", func, stack);
+  fprintf (stderr, "objects: %p  ", stack[0].object);
+  fprintf (stderr, "Nobjects: %d, NOBJECTS: %d\n", stack[0].Nobject, stack[0].NOBJECT);
+}
+
 /* allocate stack, setup with default values, allocate data */
 Stack *InitStack () {
@@ -39 +49 @@
   int i;
 
+  PrintStackInfo (stack, __func__);
   ASSERT (stack != NULL, "stack not set");
   LockStack (stack);
@@ -56 +67 @@
     stack[0].NOBJECT += 100;
     REALLOCATE (stack[0].object, void *, stack[0].NOBJECT);
+    REALLOCATE (stack[0].name,   char *, stack[0].NOBJECT);
+    REALLOCATE (stack[0].id,     int, stack[0].NOBJECT);
   }
 
   for (i = stack[0].Nobject; i > where; i--) {
     stack[0].object[i] = stack[0].object[i-1];
+    stack[0].name[i]   = stack[0].name[i-1];
+    stack[0].id[i]     = stack[0].id[i-1];
   }
   stack[0].object[where] = object;
@@ -75 +90 @@
   void *object;
   
+  PrintStackInfo (stack, __func__);
   ASSERT (stack != NULL, "stack not set");
   LockStack (stack);
@@ -100 +116 @@
   void *object;
 
+  PrintStackInfo (stack, __func__);
   ASSERT (stack != NULL, "stack not set");
   LockStack (stack);
@@ -122 +139 @@
   void *object;
   
+  PrintStackInfo (stack, __func__);
   ASSERT (stack != NULL, "stack not set");
   LockStack (stack);
@@ -143 +161 @@
   int i;
 
+  PrintStackInfo (stack, __func__);
   ASSERT (stack != NULL, "stack not set");
 
@@ -150 +169 @@
 
   /* shift the remaining entries by one */
+  /* XXX free associated memory */
   stack[0].Nobject --;
   for (i = where; i < stack[0].Nobject; i++) {
@@ -165 +185 @@
   void *object;
   
-  ASSERT (stack != NULL, "stack not set");
-
+  PrintStackInfo (stack, __func__);
+  ASSERT (stack != NULL, "stack not set");
   for (i = 0; i < stack[0].Nobject; i++) {
     if (stack[0].id[i] != id) continue;
@@ -180 +200 @@
 void LockStack (Stack *stack) {
 # ifdef THREADED
+  PrintStackInfo (stack, __func__);
   ASSERT (stack != NULL, "stack not set");
   pthread_mutex_lock (&stack[0].mutex);
@@ -188 +209 @@
 void UnlockStack (Stack *stack) {
 # ifdef THREADED
+  PrintStackInfo (stack, __func__);
   ASSERT (stack != NULL, "stack not set");
   pthread_mutex_unlock (&stack[0].mutex);