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

CVS commit program cvs at parl.clemson.edu
Fri Sep 3 11:57:04 EDT 2004


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

Modified Files:
	pvfs2-server.c pvfs2-server.h setparam.sm 
Log Message:
- moved to fully 64 bit unsigned gossip masks
- setparam mgmt method now takes uint64_t values instead of int64_t
- added object type printing to acache debugging
- fixed bug in shared-state-machine getattr that could allow
  attributes to come out of the acache with incorrect attr
  types/fields
- fixed bug is msgpair setup for create/mkdir/symlink
- gossip mask change to uint64_t and many gossip cleanups
- misc cleanups


Index: pvfs2-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.c,v
diff -p -u -r1.171 -r1.172
--- pvfs2-server.c	1 Sep 2004 20:49:31 -0000	1.171
+++ pvfs2-server.c	3 Sep 2004 14:57:03 -0000	1.172
@@ -137,10 +137,10 @@ struct PINT_server_req_params PINT_serve
 
 int main(int argc, char **argv)
 {
-    int ret = -1, debug_mask = 0;
+    int ret = -1, siglevel = 0;
     char *fs_conf = NULL, *server_conf = NULL;
-    int siglevel = 0;
     PINT_server_op *tmp_op = NULL;
+    uint64_t debug_mask = 0;
 
     init_req_table();
 
@@ -197,8 +197,8 @@ int main(int argc, char **argv)
     /* reset gossip debug mask based on configuration settings */
     debug_mask = PVFS_debug_eventlog_to_mask(server_config.event_logging);
     gossip_set_debug_mask(1, debug_mask);
-    gossip_debug(GOSSIP_SERVER_DEBUG,"Logging %s (mask %d)\n",
-                 server_config.event_logging, debug_mask);
+    gossip_debug(GOSSIP_SERVER_DEBUG,"Logging %s (mask %Lu)\n",
+                 server_config.event_logging, Lu(debug_mask));
 
     /* remove storage space and exit if requested */
     if (s_server_options.server_remove_storage_space)

Index: pvfs2-server.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.h,v
diff -p -u -r1.105 -r1.106
--- pvfs2-server.h	24 Aug 2004 17:04:24 -0000	1.105
+++ pvfs2-server.h	3 Sep 2004 14:57:03 -0000	1.106
@@ -11,6 +11,7 @@
  * DEFINE ALL THE STRUCTURES WE NEED BEFORE WE INCLUDE IT.
  */
 
+#include <stdint.h>
 #include "pvfs2-debug.h"
 #include "pvfs2-storage.h"
 #include "job.h"

Index: setparam.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/setparam.sm,v
diff -p -u -r1.17 -r1.18
--- setparam.sm	12 Aug 2004 19:53:41 -0000	1.17
+++ setparam.sm	3 Sep 2004 14:57:03 -0000	1.18
@@ -67,8 +67,8 @@ static int setparam_work(PINT_server_op 
 {
     job_id_t tmp_id;
     int ret = -1;
-    int tmp_on;
-    int tmp_mask;
+    int tmp_on = 0;
+    uint64_t tmp_mask = 0;
     int old_event_on;
     int32_t old_api_mask;
     int32_t old_op_mask;
@@ -82,7 +82,7 @@ static int setparam_work(PINT_server_op 
 	    gossip_get_debug_mask(&tmp_on, &tmp_mask);
 	    s_op->resp.u.mgmt_setparam.old_value = tmp_mask;
 	    gossip_set_debug_mask(
-                1, (int)s_op->req->u.mgmt_setparam.value);
+                1, s_op->req->u.mgmt_setparam.value);
 	    js_p->error_code = 0;
 	    return(1);
 	case PVFS_SERV_PARAM_INVALID:



More information about the PVFS2-CVS mailing list