Changeset 8486

Timestamp:

08/31/10 15:05:32 (3 years ago)

Author:

bligon

Message:

Corrected memory leaks associated with using the PJMP state machine command.
Files affected:

src/common/misc/state-machine-fns.c
src/server/create-immutable-copies.sm
src/server/get-attr.sm
src/server/list-attr.sm
src/server/module.mk.in
src/server/precreate-pool-refiller.sm
src/server/pvfs2-server.c
src/server/pvfs2-server.h
src/server/set-eattr.sm
src/server/tree-communicate.sm

Location:

branches/Orange-Branch/src

Files:

• common/misc/state-machine-fns.c (modified) (6 diffs)
• server/create-immutable-copies.sm (modified) (4 diffs)
• server/get-attr.sm (modified) (1 diff)
• server/list-attr.sm (modified) (1 diff)
• server/module.mk.in (modified) (1 diff)
• server/pvfs2-server.h (modified) (2 diffs)
• server/set-eattr.sm (modified) (1 diff)
• server/tree-communicate.sm (modified) (2 diffs)

branches/Orange-Branch/src/common/misc/state-machine-fns.c

@@ -67 +67 @@
          /* this will loop from TOS down to the base frame */
          /* base frame will not be processed */
+
+         gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"[SM Terminating Child]: my_frame:%p\n",my_frame);
          qlist_for_each_entry(f, &smcb->parent_smcb->frames, link)
          {
@@ -76 +78 @@
          }
 
+        gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"[SM Terminating Child]: children_running:%d\n"
+                                               ,smcb->parent_smcb->children_running);
         if (--smcb->parent_smcb->children_running <= 0)
         {
@@ -83 +87 @@
             job_null(0, smcb->parent_smcb, 0, r, &id, smcb->context);
         }
-        return SM_ACTION_DEFERRED;
-    }
+    }
+
     /* call state machine completion function */
     if (smcb->terminate_fn)
     {
+        if (smcb->parent_smcb)
+        {
+            gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"[SM Terminating Child]: calling terminate function.\n");
+        }   
         (*smcb->terminate_fn)(smcb, r);
     }
@@ -545 +553 @@
     struct PINT_frame_s *frame_entry, *tmp;
     assert(smcb);
+
+    gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"PINT_smcb_free: smcb:%p\n",smcb);
+
     qlist_for_each_entry_safe(frame_entry, tmp, &smcb->frames, link)
     {
+        if (frame_entry->frame)
+        {
+           gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"PINT_smcb_free: frame:%p \ttask-id:%d\n"
+                                                  ,frame_entry->frame
+                                                  ,frame_entry->task_id);
+        }
+        else
+        {
+           gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"PINT_smcb_free: NO FRAME ENTRIES.\n");
+        }
+
         if (frame_entry->frame && frame_entry->task_id == 0)
         {
             /* only free if task_id is 0 */
             free(frame_entry->frame);
-        }
+        } 
         qlist_del(&frame_entry->link);
         free(frame_entry);
@@ -739 +761 @@
 static int child_sm_frame_terminate(struct PINT_smcb * smcb, job_status_s * js_p)
 {
+    gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"CHILD TERMINATE: smcb:%p.\n",smcb);
+
     PINT_smcb_free(smcb);
     return 0;
@@ -803 +827 @@
         /* assign frame */
         PINT_sm_push_frame(new_sm, f->task_id, f->frame);
+
         /* locate SM to run */
+        gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"START CHILD FRAMES: calling smcb is %p.\n",smcb);
+        gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"START CHILD FRAMES: with frame: %p.\n",f->frame);
+        gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"START CHILD FRAMES: and task id: %d.\n",f->task_id);
         new_sm->current_state = PINT_sm_task_map(smcb, f->task_id);
+
+        gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"START CHILD FRAMES: new_sm->current_state is %s\n:"
+                                    ,(new_sm->current_state)?"VALID":"INVALID");
+        if (new_sm->current_state)
+        {
+            gossip_debug(GOSSIP_STATE_MACHINE_DEBUG,"START CHILD FRAMES: new_sm->current_state->flag is %d\n"
+                                        ,new_sm->current_state->flag);
+        }
+
         /* invoke SM */
         retval = PINT_state_machine_start(new_sm, &r);

branches/Orange-Branch/src/server/create-immutable-copies.sm

@@ -4 +4 @@
  * See COPYING in top-level directory.
  */
+
+/* adding a comment */
 
 #include <string.h>
@@ -135 +137 @@
         pjmp copy_data
         {
-           LOCAL_SRC  => pvfs2_mirror_work_sm;
-           REMOTE_SRC => pvfs2_call_msgpairarray_sm; 
+           LOCAL_SRC  => pvfs2_pjmp_mirror_work_sm;
+           REMOTE_SRC => pvfs2_pjmp_call_msgpairarray_sm; 
         }
         success => check_copy_results;
@@ -192 +194 @@
 
 } /*end nested state machine pvfs2_create_immutable_copies_sm*/
-
-%%
-
-%%
-nested machine pvfs2_call_msgpairarray_sm
-{
-   state call_msgpairarray
-    {
-        run call_msgpairarray;
-        success => transfer_msgpair;
-        default => cleanup_msgpairarray;
-    }
-
-   state transfer_msgpair
-    {
-         jump pvfs2_msgpairarray_sm;
-         default => cleanup_msgpairarray;
-    }
-
-   state cleanup_msgpairarray
-    {
-        run cleanup_msgpairarray;
-        default => return;
-    }
-} /*end nested state machine pvfs2_call_msgpairarray_sm*/
 %%
 
@@ -1908 +1885 @@
 
 
-
-
-/****************************************************************************/
-/* Actions for pvfs2_call_msgpairarray_sm                                   */
-/****************************************************************************/
-
-/*We use a separate nested state machine to call msgpairarray because */
-/*msgpairarray.sm is setup to work only with a "jump".  When "pjmp"   */
-/*is used, the frame stack gets corrupted.                            */
-static PINT_sm_action call_msgpairarray (struct PINT_smcb *smcb
-                                        ,job_status_s *js_p)
-{   
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing pvfs2_call_msgpairarray_sm:"
-                                    "call_msgpairarray....\n");
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tframe count is %d.\n",smcb->frame_count);
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\t base frame is %d.\n",smcb->base_frame);
-   struct PINT_server_op *mirror_op = PINT_sm_frame(smcb,PINT_FRAME_CURRENT);
-   PINT_sm_msgarray_op *m_op = &(mirror_op->msgarray_op);
-
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tmirror_op:%p\n",mirror_op);
-
-   js_p->error_code = 0;
-
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tm_op->msgpair.req.op:%d\n"
-                                    ,m_op->msgpair.req.op );
-
-   PINT_sm_push_frame(smcb,0,m_op);
-   
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tAFTER PUSH:smcb->base_frame:%d"
-                                    "\tframe_count:%d\n"
-                                   ,smcb->base_frame,smcb->frame_count);
-
-   return SM_ACTION_COMPLETE;
-}/*end action call_msgpairarray*/
-
-
-
-
-static PINT_sm_action cleanup_msgpairarray (struct PINT_smcb *smcb
-                                           ,job_status_s *js_p)
-{   
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"Executing IMM_COPIES:cleanup_msgpairarray"
-                                    "....\n");
-   struct PINT_server_op *mirror_op = PINT_sm_frame(smcb,PINT_FRAME_CURRENT);
-   PINT_sm_msgarray_op *m_op = &(mirror_op->msgarray_op);
-
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tmirror_op:%p\n",mirror_op);
-
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tjs_p->error_code:%d\n"
-                                   ,js_p->error_code);
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tBEFORE POP:smcb->frame_base:%d"
-                                    "\tframe_count:%d\n"
-                                   ,smcb->base_frame,smcb->frame_count);
-
-
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tm_op->msgpair.req.op:%d\n"
-                                    ,m_op->msgpair.req.op );
-
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tmirror_op->resp.status:%d\n"
-                                   ,mirror_op->resp.status);
-
-   return SM_ACTION_COMPLETE;
-}/*end action cleanup_msgpairarray*/
-
-
-
-
 int mirror_comp_fn(void *v_p, struct PVFS_server_resp *resp_p, int i)
 {

branches/Orange-Branch/src/server/get-attr.sm

@@ -245 +245 @@
 
 %%
+
+
 
 /* getattr_verify_attribs()

branches/Orange-Branch/src/server/list-attr.sm

@@ -48 +48 @@
         pjmp listattr_setup_getattr
         {
-            success => pvfs2_get_attr_work_sm;
+            success => pvfs2_pjmp_get_attr_work_sm;
         }
         success => interpret_getattrs;

branches/Orange-Branch/src/server/module.mk.in

@@ -7 +7 @@
         # automatically generated c files
         SERVER_SMCGEN := \
+                $(DIR)/pjmp-machines.c \
                 $(DIR)/setparam.c \
                 $(DIR)/lookup.c \

branches/Orange-Branch/src/server/pvfs2-server.h

@@ -717 +717 @@
 /* server side state machines */
 extern struct PINT_state_machine_s pvfs2_mirror_sm;
-
+extern struct PINT_state_machine_s pvfs2_pjmp_call_msgpairarray_sm;
+extern struct PINT_state_machine_s pvfs2_pjmp_get_attr_with_prelude_sm;
+extern struct PINT_state_machine_s pvfs2_pjmp_remove_work_sm;
+extern struct PINT_state_machine_s pvfs2_pjmp_mirror_work_sm;
+extern struct PINT_state_machine_s pvfs2_pjmp_create_immutable_copies_sm;
+extern struct PINT_state_machine_s pvfs2_pjmp_get_attr_work_sm;
 
 /* nested state machines */
@@ -731 +736 @@
 extern struct PINT_state_machine_s pvfs2_unexpected_sm;
 extern struct PINT_state_machine_s pvfs2_create_immutable_copies_sm;
-extern struct PINT_state_machine_s pvfs2_call_msgpairarray_sm;
 extern struct PINT_state_machine_s pvfs2_mirror_work_sm;
 extern struct PINT_state_machine_s pvfs2_tree_remove_work_sm;
 extern struct PINT_state_machine_s pvfs2_tree_get_file_size_work_sm;
+extern struct PINT_state_machine_s pvfs2_call_msgpairarray_sm;
 
 /* Exported Prototypes */

branches/Orange-Branch/src/server/set-eattr.sm

@@ -77 +77 @@
         pjmp setup_create_immutable_copies
         {
-           CREATE_IMM_COPIES => pvfs2_create_immutable_copies_sm;
+           CREATE_IMM_COPIES => pvfs2_pjmp_create_immutable_copies_sm;
         }
         success => inspect_imm_copies;

branches/Orange-Branch/src/server/tree-communicate.sm

@@ -74 +74 @@
         pjmp tree_remove_setup
         {
-            REMOTE_OPERATION => pvfs2_call_msgpairarray_sm;
-            LOCAL_OPERATION => pvfs2_remove_work_sm;
+            REMOTE_OPERATION => pvfs2_pjmp_call_msgpairarray_sm;
+            LOCAL_OPERATION => pvfs2_pjmp_remove_work_sm;
         }
         default => tree_remove_work_cleanup;
@@ -114 +114 @@
         pjmp tree_get_file_size_setup
         {
-            REMOTE_OPERATION => pvfs2_call_msgpairarray_sm;
-            LOCAL_OPERATION => pvfs2_get_attr_with_prelude_sm;
+            REMOTE_OPERATION => pvfs2_pjmp_call_msgpairarray_sm;
+            LOCAL_OPERATION => pvfs2_pjmp_get_attr_with_prelude_sm;
         }
         default => tree_get_file_size_work_cleanup;