[PVFS2-CVS] commit by neill in pvfs2/src/server: flush.sm

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb:/tmp/cvs-serv15333/src/server

Modified Files:
	flush.sm 
Log Message:
- misc cleanups, formatting, and debugging adding
- final version bump and changelog update before cvs tagging


Index: flush.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/flush.sm,v
diff -p -u -r1.12 -r1.13
--- flush.sm	28 Jul 2004 14:32:55 -0000	1.12
+++ flush.sm	29 Jul 2004 20:38:58 -0000	1.13
@@ -38,14 +38,15 @@ void flush_init_state_machine(void);
 
 %%
 
-machine pvfs2_flush_sm(prelude,
-                       flush_check_type,
-                       kflush,
-                       kflush_check_error,
-                       bflush, 
-                       bflush_check_error,
-                       final_response,
-                       cleanup)
+machine pvfs2_flush_sm(
+    prelude,
+    flush_check_type,
+    kflush,
+    kflush_check_error,
+    bflush, 
+    bflush_check_error,
+    final_response,
+    cleanup)
 {
     state prelude
     {
@@ -133,11 +134,14 @@ static int flush_check_type(PINT_server_
  */
 static int flush_keyval_flush(PINT_server_op *s_op, job_status_s * js_p)
 {
-    int ret;
+    int ret = - 1;
     job_id_t i;
 
     PINT_STATE_DEBUG("kflush");
 
+    gossip_debug(GOSSIP_SERVER_DEBUG, " doing keyval flush on %Lu,%d\n",
+                 Lu(s_op->req->u.flush.handle), s_op->req->u.flush.fs_id);
+
     ret = job_trove_keyval_flush(
         s_op->req->u.flush.fs_id,
         s_op->req->u.flush.handle,
@@ -148,7 +152,7 @@ static int flush_keyval_flush(PINT_serve
         &i,
         server_job_context);
 
-    return (ret);
+    return ret;
 }
 
 static int flush_check_error(PINT_server_op *s_op, job_status_s *js_p)
@@ -181,11 +185,14 @@ static int flush_check_error(PINT_server
  */
 static int flush_bstream_flush(PINT_server_op *s_op, job_status_s * js_p)
 {
-    int ret;
+    int ret = -1;
     job_id_t i;
 
     PINT_STATE_DEBUG("bflush");
 
+    gossip_debug(GOSSIP_SERVER_DEBUG, " doing bstream flush on %Lu,%d\n",
+                 Lu(s_op->req->u.flush.handle), s_op->req->u.flush.fs_id);
+
     ret = job_trove_bstream_flush(
         s_op->req->u.flush.fs_id,
         s_op->req->u.flush.handle,
@@ -196,7 +203,7 @@ static int flush_bstream_flush(PINT_serv
         &i,
         server_job_context);
 
-    return (ret);
+    return ret;
 }
 	    
 static int flush_cleanup(PINT_server_op *s_op, job_status_s *js_p)