[PVFS2-CVS]
commit by pcarns in pvfs2/src/server: pvfs2-server.c pvfs2-server.h
CVS commit program
cvs at parl.clemson.edu
Tue Jul 13 16:56:35 EDT 2004
Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb:/tmp/cvs-serv24645/src/server
Modified Files:
pvfs2-server.c pvfs2-server.h
Log Message:
shuffle declaration of server_state_machine_start_noreq() around so that it
is available for use within other server state machines
Index: pvfs2-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.c,v
diff -p -u -r1.154 -r1.155
--- pvfs2-server.c 8 Jul 2004 21:21:51 -0000 1.154
+++ pvfs2-server.c 13 Jul 2004 19:56:35 -0000 1.155
@@ -125,7 +125,6 @@ static int server_parse_cmd_line_args(in
static void server_state_table_initialize(void);
static int server_state_machine_start(
PINT_server_op *s_op, job_status_s *js_p);
-static int server_state_machine_start_noreq(enum PVFS_server_op op);
#ifdef __PVFS2_SEGV_BACKTRACE__
static void bt_sighandler(int sig, siginfo_t *info, void *secret);
#endif
@@ -1309,7 +1308,7 @@ static int server_state_machine_start(
return ((s_op->current_state->state_action))(s_op,js_p);
}
-/* static int server_state_machine_start_noreq()
+/* server_state_machine_start_noreq()
*
* similar in purpose to server_state_machine_start(), except that it
* kicks off a state machine instance without first receiving a
@@ -1317,7 +1316,7 @@ static int server_state_machine_start(
*
* returns 0 on success, -PVFS_error on failure
*/
-static int server_state_machine_start_noreq(enum PVFS_server_op op)
+int server_state_machine_start_noreq(enum PVFS_server_op op)
{
PINT_server_op* tmp_s_op;
job_status_s tmp_status;
Index: pvfs2-server.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.h,v
diff -p -u -r1.89 -r1.90
--- pvfs2-server.h 13 Jul 2004 02:54:17 -0000 1.89
+++ pvfs2-server.h 13 Jul 2004 19:56:35 -0000 1.90
@@ -356,13 +356,15 @@ extern struct PINT_state_machine_s pvfs2
/* Exported Prototypes */
struct server_configuration_s *get_server_config_struct(void);
-/* INCLUDE STATE-MACHINE.H DOWN HERE */
-#define PINT_OP_STATE PINT_server_op
-#define PINT_OP_STATE_TABLE PINT_server_op_table
-
/* exported state machine resource reclamation function */
int server_state_machine_complete(PINT_server_op *s_op);
+/* starts state machines that are not associated with an incoming request */
+int server_state_machine_start_noreq(enum PVFS_server_op op);
+
+/* INCLUDE STATE-MACHINE.H DOWN HERE */
+#define PINT_OP_STATE PINT_server_op
+#define PINT_OP_STATE_TABLE PINT_server_op_table
#include "state-machine.h"
More information about the PVFS2-CVS
mailing list