Changeset 7826

Timestamp:

06/16/09 16:08:34 (4 years ago)

Author:

sson

Message:

Used PINT_sm_frame(smcb->parent_smcb, 0) to refer parent smcbs in pipeline.sm.
Removed possible double free() in io.sm.

Location:

branches/as-branch/src

Files:

• common/misc/state-machine-fns.c (modified) (2 diffs)
• server/io.sm (modified) (5 diffs)
• server/pipeline.sm (modified) (7 diffs)
• server/pvfs2-server.h (modified) (1 diff)

branches/as-branch/src/common/misc/state-machine-fns.c

@@ -309 +309 @@
         while (smcb->current_state->flag == SM_JUMP)
         {
+            gossip_debug(GOSSIP_STATE_MACHINE_DEBUG, "%s: SM_JUMP\n", __func__);
             PINT_push_state(smcb, smcb->current_state);
             smcb->current_state =
@@ -657 +658 @@
         }
         frame_entry = qlist_entry(prev, struct PINT_frame_s, link);
+        gossip_debug(GOSSIP_STATE_MACHINE_DEBUG, "returned frame=%p\n",
+                     frame_entry->frame); /* sson */
         return frame_entry->frame;
     }

branches/as-branch/src/server/io.sm

@@ -55 +55 @@
             success => pvfs2_pipeline_sm;
         }
-        success => send_completion_ack;
+        success => cleanup_pipeline;
+    }
+
+    state cleanup_pipeline
+    {
+        run cleanup_pipeline_sm;
+        success => send_completion_ack;
         default => release;
     }
@@ -289 +295 @@
         pipeline_op->u.pipeline.seg_handle = seg_handle;
         pipeline_op->u.pipeline.id = id[i];
-        pipeline_op->u.pipeline.parent = s_op;
+        //pipeline_op->u.pipeline.parent = s_op;
         pipeline_op->u.pipeline.hints = s_op->req->hints;
         pipeline_op->u.pipeline.tag = s_op->tag;
@@ -358 +364 @@
 }
 
-/*
- * Function: io_release()
- *
- * Params:   server_op *b, 
- *           job_status_s* js_p
- *
- * Pre:      we are done with all steps necessary to service
- *           request
- *
- * Post:     operation has been released from the scheduler
- *
- * Returns:  int
- *
- * Synopsis: releases the operation from the scheduler
- */
-static PINT_sm_action io_release(
-        struct PINT_smcb *smcb, job_status_s *js_p)
+static PINT_sm_action cleanup_pipeline_sm(struct PINT_smcb *smcb, 
+                                          job_status_s *js_p)
 {
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    int ret = 0;
-    job_id_t i;
-
-    /*
-      tell the scheduler that we are done with this operation (if it
-      was scheduled in the first place)
-    */
-    ret = job_req_sched_release(
-        s_op->scheduled_id, smcb, 0, js_p, &i, server_job_context);
-    return ret;
-}
-
-/*
- * Function: io_cleanup()
- *
- * Params:   server_op *b, 
- *           job_status_s* js_p
- *
- * Pre:      all jobs done, simply need to clean up
- *
- * Post:     everything is free
- *
- * Returns:  int
- *
- * Synopsis: free up any buffers associated with the operation,
- *           including any encoded or decoded protocol structures
- */
-static PINT_sm_action io_cleanup(
-        struct PINT_smcb *smcb, job_status_s *js_p)
-{
-    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    char status_string[64] = {0};
     int i;
     struct PINT_server_op *pipeline_op;
@@ -414 +373 @@
     int remaining;
     PVFS_error tmp_err;
-
-    PVFS_strerror_r(s_op->resp.status, status_string, 64);
-    PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "finish (%s)\n", status_string);
-
-    if (s_op->u.io.seg_handle) {
-        gossip_debug(GOSSIP_IO_DEBUG, "%s: freeing seg_handle\n", __func__);
-        PINT_segpool_destroy(s_op->u.io.seg_handle);
-    }
-
-    if(s_op->u.io.tmp_buffer)
-        free(s_op->u.io.tmp_buffer); /* FIXME */
 
     for(i=0; i<s_op->u.io.parallel_sms; i++)
@@ -447 +395 @@
     }
 
+    js_p->error_code = 0;
+    return SM_ACTION_COMPLETE;
+}
+
+                                         
+/*
+ * Function: io_release()
+ *
+ * Params:   server_op *b, 
+ *           job_status_s* js_p
+ *
+ * Pre:      we are done with all steps necessary to service
+ *           request
+ *
+ * Post:     operation has been released from the scheduler
+ *
+ * Returns:  int
+ *
+ * Synopsis: releases the operation from the scheduler
+ */
+static PINT_sm_action io_release(
+        struct PINT_smcb *smcb, job_status_s *js_p)
+{
+    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
+    int ret = 0;
+    job_id_t i;
+
+    /*
+      tell the scheduler that we are done with this operation (if it
+      was scheduled in the first place)
+    */
+    ret = job_req_sched_release(
+        s_op->scheduled_id, smcb, 0, js_p, &i, server_job_context);
+    return ret;
+}
+
+/*
+ * Function: io_cleanup()
+ *
+ * Params:   server_op *b, 
+ *           job_status_s* js_p
+ *
+ * Pre:      all jobs done, simply need to clean up
+ *
+ * Post:     everything is free
+ *
+ * Returns:  int
+ *
+ * Synopsis: free up any buffers associated with the operation,
+ *           including any encoded or decoded protocol structures
+ */
+static PINT_sm_action io_cleanup(
+        struct PINT_smcb *smcb, job_status_s *js_p)
+{
+    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
+    char status_string[64] = {0};
+
+    PVFS_strerror_r(s_op->resp.status, status_string, 64);
+    PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "finish (%s)\n", status_string);
+
+    if (s_op->u.io.seg_handle) {
+        gossip_debug(GOSSIP_IO_DEBUG, "%s: freeing seg_handle\n", __func__);
+        PINT_segpool_destroy(s_op->u.io.seg_handle);
+    }
+#if 0
+    if(s_op->u.io.tmp_buffer)
+        free(s_op->u.io.tmp_buffer); /* FIXME */
+#endif
     gen_mutex_destroy(&s_op->u.io.mutex); /* FIXME: */
 

branches/as-branch/src/server/pipeline.sm

@@ -124 +124 @@
 
     gossip_debug(GOSSIP_IO_DEBUG, "smcb->base_frame=%d, frame_count=%d\n", smcb->base_frame, smcb->frame_count);
-    gossip_debug(GOSSIP_IO_DEBUG, "smcb=%p, smcb->parent_smcb=%p\n", smcb, smcb->parent_smcb);
     s_op->u.pipeline.buffer_used = 0;
     bytes = s_op->u.pipeline.buffer_size;
@@ -221 +220 @@
     job_id_t tmp_id;
     struct server_configuration_s *user_opts = get_server_config_struct();
-    struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent;
+    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0);
 
     if(s_op->u.pipeline.segs == 0) {
@@ -310 +309 @@
 {
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent;
+    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0);
     js_p->error_code = 0;
     PVFS_size file_req_offset = parent_s_op->u.io.file_req_offset;
@@ -366 +365 @@
 {
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent;
+    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0);
     PINT_sm_msgpair_state *msg_p = NULL;
     struct server_configuration_s *user_opts = get_server_config_struct();
@@ -504 +503 @@
 {
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent;
+    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0);
     js_p->error_code = 0;
 
@@ -754 +753 @@
 {
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent;
+    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0);
     int ret, tmp_id;
     struct server_configuration_s *user_opts = get_server_config_struct();
@@ -808 +807 @@
 {
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    struct PINT_server_op *parent_s_op = s_op->u.pipeline.parent;
+    struct PINT_server_op *parent_s_op = PINT_sm_frame(smcb->parent_smcb, 0);
     PINT_segpool_handle_t h = s_op->u.pipeline.seg_handle;
     js_p->error_code = 0;

branches/as-branch/src/server/pvfs2-server.h

@@ -380 +380 @@
     enum PVFS_io_type io_type;
 
-    void *parent;
     char *buffer; 
     PVFS_size buffer_size;