Changeset 8925

Timestamp:

07/08/11 15:47:24 (2 years ago)

Author:

bligon

Message:

Corrected memory leak: when an operation completes, the PINT_manager_complete_op function removes the operation
from the io_manager's list but does not free the operation structure or remove the op-id from the registered list,
causing a memory leak. To correct, the op-id is unregistered and the op structure is freed after the
PINT_manager_complete_op() function is called.

Files:

• branches/Orange-Branch/src/common/mgmt/pint-worker-threaded-queues.c (modified) (8 diffs)

branches/Orange-Branch/src/common/mgmt/pint-worker-threaded-queues.c

@@ -75 +75 @@
             gen_cond_destroy(&w->cond);
         }
+        gossip_debug(GOSSIP_MGMT_DEBUG,"%s:thread_id %d:thread #%d.\n"
+                                      ,__func__
+                                      ,(int)w->threads[i].thread_id,i);
     }
 
@@ -338 +341 @@
     gen_mutex_unlock(&thread->mutex);
 
+    gossip_debug(GOSSIP_MGMT_DEBUG,"%s:thread-id %d:worker location is %p: manager location is %p.\n"
+                                  ,__func__
+                                  ,(int)thread->thread_id
+                                  ,worker
+                                  ,manager);
+
     gen_mutex_lock(&worker->mutex);
     op_count = worker->attr.ops_per_queue;
@@ -347 +356 @@
     gen_mutex_unlock(&worker->mutex);
 
+    gossip_debug(GOSSIP_MGMT_DEBUG,"%s:thread-id %d:op-count is %d:timeout is %d.\n"
+                                  ,__func__
+                                  ,(int)thread->thread_id
+                                  ,op_count
+                                  ,timeout);
     qentries = malloc(sizeof(PINT_queue_entry_t *) * op_count);
     if(!qentries)
@@ -357 +371 @@
     gen_mutex_lock(&thread->mutex);
     thread->running = 1;
+    gossip_debug(GOSSIP_MGMT_DEBUG,"%s: starting thread function for thread_id %d\n"
+                                  ,__func__
+                                  ,(int)thread->thread_id);
     while(thread->running)
     {
@@ -421 +438 @@
             if(op_count > 0)
             {
+                gossip_debug(GOSSIP_MGMT_DEBUG,"%s:thread_id %d: op_count is %d.\n"
+                                              ,__func__
+                                              ,(int)thread->thread_id,op_count);
                 for(i = 0; i < op_count; ++i)
                 {
+                    struct PINT_op_entry *op_entry;
+                    gossip_debug(GOSSIP_MGMT_DEBUG,"%s:thread_id %d: i is %d.\n"
+                                                  ,__func__
+                                                  ,(int)thread->thread_id,i);
                     op = PINT_op_from_qentry(qentries[i]);
                     /* service the operation */
+                    gossip_debug(GOSSIP_MGMT_DEBUG,"%s:thread_id %d: calling PINT_manager_service_op.\n"
+                                                  ,__func__
+                                                  ,(int)thread->thread_id);
                     ret = PINT_manager_service_op(
                         manager, op, &service_time, &error);
@@ -433 +460 @@
                     }
 
+                    gossip_debug(GOSSIP_MGMT_DEBUG,"%s:thread_id %d: calling PINT_manager_complete_op.\n"
+                                                  ,__func__
+                                                  ,(int)thread->thread_id);
                     ret = PINT_manager_complete_op(
                         manager, op, error);
@@ -439 +469 @@
                         /* fatal if we can't complete an op */
                         goto free_ops;
+                    }
+                    op_entry = id_gen_safe_lookup(op->id);
+                    if (op_entry)
+                    {
+                        id_gen_safe_unregister(op_entry->op.id);
+                        free(op_entry);
+                        op_entry = NULL;
                     }
                 }
@@ -466 +503 @@
         /* lock the mutex again before checking the running field */
         gen_mutex_lock(&thread->mutex);
-    }
+    }/*end while thread->running*/
 
     gen_mutex_unlock(&thread->mutex);