[PVFS2-CVS] commit by bradles in pvfs2/src/client/sysint: sys-io.sm
sys-truncate.sm
CVS commit program
cvs at parl.clemson.edu
Thu Jul 7 12:35:44 EDT 2005
Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb:/tmp/cvs-serv18292/src/client/sysint
Modified Files:
sys-io.sm sys-truncate.sm
Log Message:
Updates for standardized spelling in pint-request.h and new distribution
function signatures.
Index: sys-io.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-io.sm,v
diff -p -u -r1.118 -r1.119
--- sys-io.sm 7 Jun 2005 22:54:46 -0000 1.118
+++ sys-io.sm 7 Jul 2005 15:35:44 -0000 1.119
@@ -1942,14 +1942,14 @@ static inline int check_for_zero_fill_on
int i = 0, val = 0;
PINT_Request_state *mrs = NULL, *frs = NULL;
PINT_Request_result seg_result;
- PINT_Request_file_data *file_data = NULL;
+ PINT_request_file_data *file_data = NULL;
int64_t offset_array[16] = {0}, size_array[16] = {0};
PVFS_size total_ctx_size = 0;
assert(sm_p->u.io.io_type == PVFS_IO_READ);
- mrs = PINT_New_request_state(sm_p->u.io.mem_req);
- frs = PINT_New_request_state(sm_p->u.io.file_req);
+ mrs = PINT_new_request_state(sm_p->u.io.mem_req);
+ frs = PINT_new_request_state(sm_p->u.io.file_req);
assert(mrs && frs);
memset(&seg_result, 0, sizeof(PINT_Request_result));
@@ -1990,8 +1990,8 @@ static inline int check_for_zero_fill_on
"(size=%Ld, total_size=%Ld)\n",
Ld(sm_p->u.io.size), Ld(sm_p->u.io.total_size));
- PINT_Free_request_state(mrs);
- PINT_Free_request_state(frs);
+ PINT_free_request_state(mrs);
+ PINT_free_request_state(frs);
return IO_GET_DATAFILE_SIZE;
}
@@ -2008,7 +2008,7 @@ static inline int check_for_zero_fill_on
memset(offset_array, 0, (16 * sizeof(int64_t)));
memset(size_array, 0, (16 * sizeof(int64_t)));
- val = PINT_Process_request(
+ val = PINT_process_request(
frs, mrs, file_data, &seg_result, PINT_CLIENT);
if (val < 0)
@@ -2092,8 +2092,8 @@ static inline int check_for_zero_fill_on
"(size=%Ld, total_size=%Ld)\n",
Ld(sm_p->u.io.size), Ld(sm_p->u.io.total_size));
- PINT_Free_request_state(mrs);
- PINT_Free_request_state(frs);
+ PINT_free_request_state(mrs);
+ PINT_free_request_state(frs);
return IO_GET_DATAFILE_SIZE;
}
@@ -2101,8 +2101,8 @@ static inline int check_for_zero_fill_on
request_process_failure:
- PINT_Free_request_state(mrs);
- PINT_Free_request_state(frs);
+ PINT_free_request_state(mrs);
+ PINT_free_request_state(frs);
return 0;
}
#endif
@@ -2125,7 +2125,7 @@ static int io_find_target_datafiles(
int ret = -PVFS_EINVAL, i = 0;
struct PINT_Request_state *req_state = NULL;
struct PINT_Request_state *mem_req_state = NULL;
- PINT_Request_file_data tmp_file_data;
+ PINT_request_file_data tmp_file_data;
PINT_Request_result tmp_result;
gossip_debug(GOSSIP_IO_DEBUG, "- io_find_target_datafiles called\n");
@@ -2136,15 +2136,15 @@ static int io_find_target_datafiles(
}
*handle_index_out_count = 0;
- req_state = PINT_New_request_state(file_req);
+ req_state = PINT_new_request_state(file_req);
if (!req_state)
{
return -PVFS_ENOMEM;
}
- mem_req_state = PINT_New_request_state(mem_req);
+ mem_req_state = PINT_new_request_state(mem_req);
if (!mem_req_state)
{
- PINT_Free_request_state(req_state);
+ PINT_free_request_state(req_state);
return -PVFS_ENOMEM;
}
@@ -2179,14 +2179,14 @@ static int io_find_target_datafiles(
tmp_result.bytemax = 1;
tmp_result.segmax = 1;
- /* PINT_Process_request() returns number of bytes processed */
- ret = PINT_Process_request(
+ /* PINT_process_request() returns number of bytes processed */
+ ret = PINT_process_request(
req_state, mem_req_state, &tmp_file_data,
&tmp_result, PINT_CKSIZE);
if (ret < 0)
{
- PINT_Free_request_state(mem_req_state);
- PINT_Free_request_state(req_state);
+ PINT_free_request_state(mem_req_state);
+ PINT_free_request_state(req_state);
return ret;
}
@@ -2202,8 +2202,8 @@ static int io_find_target_datafiles(
__func__, i, *handle_index_out_count);
}
}
- PINT_Free_request_state(req_state);
- PINT_Free_request_state(mem_req_state);
+ PINT_free_request_state(req_state);
+ PINT_free_request_state(mem_req_state);
return 0;
}
Index: sys-truncate.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-truncate.sm,v
diff -p -u -r1.37 -r1.38
--- sys-truncate.sm 11 Jan 2005 14:00:26 -0000 1.37
+++ sys-truncate.sm 7 Jul 2005 15:35:44 -0000 1.38
@@ -21,6 +21,7 @@
#include "gossip.h"
#include "str-utils.h"
#include "pint-util.h"
+#include "pint-request.h"
#include "pint-servreq.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
@@ -179,7 +180,8 @@ static int truncate_datafile_setup_msgpa
PVFS_object_attr *attr = NULL;
PINT_sm_msgpair_state *msg_p = NULL;
PVFS_size new_dfile_size = 0;
-
+ PINT_request_file_data file_data;
+
gossip_debug(GOSSIP_CLIENT_DEBUG,
"(%p) truncate state: datafile_setup_msgpairarray\n", sm_p);
@@ -207,6 +209,13 @@ static int truncate_datafile_setup_msgpa
return 1;
}
+ /* Initialize the file data struct */
+ memset(&file_data, 0, sizeof(file_data));
+ file_data.dist = attr->u.meta.dist;
+ file_data.server_ct = attr->u.meta.dfile_count;
+ file_data.extend_flag = 1;
+
+ /* Construct truncate messages */
for (i = 0; i < attr->u.meta.dfile_count; i++)
{
msg_p = &sm_p->msgarray[i];
@@ -217,9 +226,11 @@ static int truncate_datafile_setup_msgpa
Ld(sm_p->u.truncate.size),
Lu(attr->u.meta.dfile_array[i]));
+ file_data.server_nr = i;
new_dfile_size =
attr->u.meta.dist->methods->logical_to_physical_offset(
- attr->u.meta.dist->params, i, attr->u.meta.dfile_count,
+ attr->u.meta.dist->params,
+ &file_data,
sm_p->u.truncate.size);
gossip_debug(GOSSIP_CLIENT_DEBUG,
More information about the PVFS2-CVS
mailing list