From: Ian W. <del...@us...> - 2005-02-23 01:17:15
|
Update of /cvsroot/ipbench/ipbench2/src/tests/dummy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24925/tests/dummy Modified Files: dummy.c dummy.h dummy_target.c dummy_target.h Log Message: convert void* to char* to fit in with python Index: dummy_target.h =================================================================== RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy_target.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dummy_target.h 23 Feb 2005 00:38:29 -0000 1.5 --- dummy_target.h 23 Feb 2005 01:17:04 -0000 1.6 *************** *** 7,13 **** int dummy_target_start(struct timeval *start); int dummy_target_stop(struct timeval *stop); ! int dummy_target_marshall(void **data, int *size, double running_time); ! void dummy_target_marshall_cleanup(void **data); ! int dummy_target_unmarshall(void *input, int input_len, void **data, int *data_len); ! void dummy_target_unmarshall_cleanup(void **data); int dummy_target_output(struct client_data *data); --- 7,13 ---- int dummy_target_start(struct timeval *start); int dummy_target_stop(struct timeval *stop); ! int dummy_target_marshall(char **data, int *size, double running_time); ! void dummy_target_marshall_cleanup(char **data); ! int dummy_target_unmarshall(char *input, int input_len, char **data, int *data_len); ! void dummy_target_unmarshall_cleanup(char **data); int dummy_target_output(struct client_data *data); Index: dummy.h =================================================================== RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dummy.h 23 Feb 2005 00:38:29 -0000 1.5 --- dummy.h 23 Feb 2005 01:17:04 -0000 1.6 *************** *** 8,14 **** int dummy_start(struct timeval *start); int dummy_stop(struct timeval *stop); ! int dummy_marshall(void **data, int *size, double running_time); ! void dummy_marshall_cleanup(void **data); ! int dummy_unmarshall(void *input, int input_len, void **data, int *data_len); ! void dummy_unmarshall_cleanup(void **data); int dummy_output(struct client_data data[], int nelem); --- 8,14 ---- int dummy_start(struct timeval *start); int dummy_stop(struct timeval *stop); ! int dummy_marshall(char **data, int *size, double running_time); ! void dummy_marshall_cleanup(char **data); ! int dummy_unmarshall(char *input, int input_len, char **data, int *data_len); ! void dummy_unmarshall_cleanup(char **data); int dummy_output(struct client_data data[], int nelem); Index: dummy.c =================================================================== RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dummy.c 23 Feb 2005 00:38:29 -0000 1.11 --- dummy.c 23 Feb 2005 01:17:04 -0000 1.12 *************** *** 57,61 **** */ int ! dummy_marshall (void **data, int * size, double running_time) { char *ok_string = "You have successfully called the dummy test!"; --- 57,61 ---- */ int ! dummy_marshall (char **data, int * size, double running_time) { char *ok_string = "You have successfully called the dummy test!"; *************** *** 88,92 **** */ void ! dummy_marshall_cleanup(void **data) { dbprintf("DUMMY CLEANUP MARSHALL\n"); --- 88,92 ---- */ void ! dummy_marshall_cleanup(char **data) { dbprintf("DUMMY CLEANUP MARSHALL\n"); *************** *** 105,109 **** */ int ! dummy_unmarshall(void *input, int input_len, void **data, int * data_len) { --- 105,109 ---- */ int ! dummy_unmarshall(char *input, int input_len, char **data, int * data_len) { *************** *** 122,126 **** */ void ! dummy_unmarshall_cleanup(void **data) { free(*data); --- 122,126 ---- */ void ! dummy_unmarshall_cleanup(char **data) { free(*data); Index: dummy_target.c =================================================================== RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy_target.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dummy_target.c 23 Feb 2005 00:38:29 -0000 1.8 --- dummy_target.c 23 Feb 2005 01:17:04 -0000 1.9 *************** *** 61,65 **** */ int ! dummy_target_marshall(void **data, int * size, double running_time) { char *ok_string = "You have successfully called the dummy target test!"; --- 61,65 ---- */ int ! dummy_target_marshall(char **data, int * size, double running_time) { char *ok_string = "You have successfully called the dummy target test!"; *************** *** 77,81 **** */ void ! dummy_target_marshall_cleanup(void **data) { dbprintf("DUMMY TARGET CLEANUP MARSHALL\n"); --- 77,81 ---- */ void ! dummy_target_marshall_cleanup(char **data) { dbprintf("DUMMY TARGET CLEANUP MARSHALL\n"); *************** *** 94,98 **** */ int ! dummy_target_unmarshall(void *input, int input_len, void **data, int *data_len) { --- 94,98 ---- */ int ! dummy_target_unmarshall(char *input, int input_len, char **data, int *data_len) { *************** *** 110,114 **** */ void ! dummy_target_unmarshall_cleanup(void **data) { free(*data); --- 110,114 ---- */ void ! dummy_target_unmarshall_cleanup(char **data) { free(*data); |