From: mquinson Date: Tue, 25 Apr 2006 12:40:20 +0000 (+0000) Subject: Split into several files to explain how it can be done X-Git-Tag: v3.3~3174 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/12538c6ab1bc03405ac74e6b2995ba1b4ee29bfa Split into several files to explain how it can be done git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2184 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/gras/mmrpc/Makefile.am b/examples/gras/mmrpc/Makefile.am index 46d20142ae..2011f2b4ba 100644 --- a/examples/gras/mmrpc/Makefile.am +++ b/examples/gras/mmrpc/Makefile.am @@ -1,17 +1,17 @@ INCLUDES= -I$(top_srcdir)/include TESTS= test_rl test_sg -EXTRA_DIST=mmrpc_deployment.xml $(TESTS) +EXTRA_DIST=mmrpc_deployment.xml mmrpc.h $(TESTS) # AUTOMAKE variable definition noinst_PROGRAMS=mmrpc_client mmrpc_server mmrpc_simulator -mmrpc_simulator_SOURCES= _mmrpc_simulator.c mmrpc.c +mmrpc_simulator_SOURCES=_mmrpc_simulator.c mmrpc_common.c mmrpc_client.c mmrpc_server.c mmrpc_simulator_LDADD= $(top_builddir)/src/libsimgrid.la -mmrpc_client_SOURCES= _mmrpc_client.c mmrpc.c +mmrpc_client_SOURCES= _mmrpc_client.c mmrpc_common.c mmrpc_client.c mmrpc_client_LDADD= $(top_builddir)/src/libgras.la -mmrpc_server_SOURCES= _mmrpc_server.c mmrpc.c +mmrpc_server_SOURCES= _mmrpc_server.c mmrpc_common.c mmrpc_server.c mmrpc_server_LDADD= $(top_builddir)/src/libgras.la # Take care of generatated sources diff --git a/examples/gras/mmrpc/mmrpc.c b/examples/gras/mmrpc/mmrpc.c deleted file mode 100644 index 22e72e8535..0000000000 --- a/examples/gras/mmrpc/mmrpc.c +++ /dev/null @@ -1,214 +0,0 @@ -/* $Id$ */ - -/* GridRPC - Fake Grid RPC thingy doing matrix multiplications (as expected)*/ - -/* Copyright (c) 2005 Martin Quinson. All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include "gras.h" - -#define MATSIZE 128 - -XBT_LOG_NEW_DEFAULT_CATEGORY(MatMult,"Messages specific to this example"); - -GRAS_DEFINE_TYPE(s_matrix, -struct s_matrix { - int rows; - int cols; - double *ctn GRAS_ANNOTE(size, rows*cols); -};) -typedef struct s_matrix matrix_t; - -static void mat_dump(matrix_t *mat, const char* name) { - int i,j; - - printf(">>> Matrix %s dump (%d x %d)\n",name,mat->rows,mat->cols); - for (i=0; irows; i++) { - printf(" "); - for (j=0; jcols; j++) - printf(" %.2f",mat->ctn[i*mat->cols + j]); - printf("\n"); - } - printf("<<< end of matrix %s dump\n",name); -} - -/* register messages which may be sent and their payload - (common to client and server) */ -static void register_messages(void) { - gras_datadesc_type_t matrix_type, request_type; - - matrix_type=gras_datadesc_by_symbol(s_matrix); - request_type=gras_datadesc_array_fixed("matrix_t[2]",matrix_type,2); - - gras_msgtype_declare("answer", matrix_type); - gras_msgtype_declare("request", request_type); -} - -/* Function prototypes */ -int server (int argc,char *argv[]); -int client (int argc,char *argv[]); - -/* ********************************************************************** - * Server code - * **********************************************************************/ - -static int server_cb_request_handler(gras_msg_cb_ctx_t ctx, void *payload_data) { - gras_socket_t expeditor=gras_msg_cb_ctx_from(ctx); - - /* 1. Get the payload into the data variable */ - matrix_t *data=(matrix_t*)payload_data; - matrix_t result; - int i,j,k; - - /* 2. Make some room to return the result */ - result.rows = data[0].rows; - result.cols = data[1].cols; - result.ctn = xbt_malloc0(sizeof(double) * result.rows * result.cols); - - /* 3. Do the computation */ - for (i=0; i>>>>>>> Connected to server which is on %s:%d <<<<<<<<", - gras_socket_peer_name(toserver),gras_socket_peer_port(toserver)); - - /* 7. Prepare and send the request to the server */ - - request[0].rows=request[0].cols=request[1].rows=request[1].cols=MATSIZE; - - request[0].ctn=xbt_malloc0(sizeof(double)*MATSIZE*MATSIZE); - request[1].ctn=xbt_malloc0(sizeof(double)*MATSIZE*MATSIZE); - - for (i=0; i>>>>>>> Request sent to %s:%d <<<<<<<<", - gras_socket_peer_name(toserver),gras_socket_peer_port(toserver)); - - /* 8. Wait for the answer from the server, and deal with issues */ - gras_msg_wait(6000,gras_msgtype_by_name("answer"),&from,&answer); - - /* mat_dump(&answer,"C:answer");*/ - for (i=0; i>>>>>>> Got answer from %s:%d <<<<<<<<", - gras_socket_peer_name(from),gras_socket_peer_port(from)); - - /* 10. Free the allocated resources, and shut GRAS down */ - free(answer.ctn); - gras_socket_close(toserver); - gras_exit(); - INFO0("Done."); - return 0; -} /* end_of_client */ diff --git a/examples/gras/mmrpc/mmrpc.h b/examples/gras/mmrpc/mmrpc.h new file mode 100644 index 0000000000..6ed5807a37 --- /dev/null +++ b/examples/gras/mmrpc/mmrpc.h @@ -0,0 +1,35 @@ +/* $Id$ */ + +/* GridRPC - Fake Grid RPC thingy doing matrix multiplications (as expected)*/ + +/* Copyright (c) 2005 Martin Quinson. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#ifndef MMRPC_H +#define MMRPC_H + +#include "gras.h" + +#define MATSIZE 128 + +void mat_dump(matrix_t *mat, const char* name); + +/* register messages which may be sent and their payload + (common to client and server) */ +void mmrpc_register_messages(void); + +/* Function prototypes */ +int server (int argc,char *argv[]); +int client (int argc,char *argv[]); + +GRAS_DEFINE_TYPE(s_matrix, +struct s_matrix { + int rows; + int cols; + double *ctn GRAS_ANNOTE(size, rows*cols); +};) +typedef struct s_matrix matrix_t; + +#endif /* MMRPC_H */ diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c new file mode 100644 index 0000000000..edab230f20 --- /dev/null +++ b/examples/gras/mmrpc/mmrpc_client.c @@ -0,0 +1,97 @@ +/* $Id$ */ + +/* GridRPC - Fake Grid RPC thingy doing matrix multiplications (as expected)*/ + +/* Copyright (c) 2005 Martin Quinson. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#define GRAS_DEFINE_TYPE_EXTERN +#include "mmrpc.h" + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(MatMult); + +int client(int argc,char *argv[]) { + xbt_ex_t e; + gras_socket_t toserver=NULL; /* peer */ + + gras_socket_t from; + matrix_t request[2], answer; + + int i,j; + + const char *host = "127.0.0.1"; + int port = 4000; + + /* 1. Init the GRAS's infrastructure */ + gras_init(&argc, argv); + + /* 2. Get the server's address. The command line override defaults when specified */ + if (argc == 3) { + host=argv[1]; + port=atoi(argv[2]); + } + + INFO2("Launch client (server on %s:%d)",host,port); + + /* 3. Wait for the server startup */ + gras_os_sleep(1); + + /* 4. Create a socket to speak to the server */ + TRY { + toserver=gras_socket_client(host,port); + } CATCH(e) { + RETHROW0("Unable to connect to the server: %s"); + } + INFO2("Connected to %s:%d.",host,port); + + + /* 5. Register the messages (before use) */ + mmrpc_register_messages(); + + /* 6. Keep the user informed of what's going on */ + INFO2(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<", + gras_socket_peer_name(toserver),gras_socket_peer_port(toserver)); + + /* 7. Prepare and send the request to the server */ + + request[0].rows=request[0].cols=request[1].rows=request[1].cols=MATSIZE; + + request[0].ctn=xbt_malloc0(sizeof(double)*MATSIZE*MATSIZE); + request[1].ctn=xbt_malloc0(sizeof(double)*MATSIZE*MATSIZE); + + for (i=0; i>>>>>>> Request sent to %s:%d <<<<<<<<", + gras_socket_peer_name(toserver),gras_socket_peer_port(toserver)); + + /* 8. Wait for the answer from the server, and deal with issues */ + gras_msg_wait(6000,gras_msgtype_by_name("answer"),&from,&answer); + + /* mat_dump(&answer,"C:answer");*/ + for (i=0; i>>>>>>> Got answer from %s:%d <<<<<<<<", + gras_socket_peer_name(from),gras_socket_peer_port(from)); + + /* 10. Free the allocated resources, and shut GRAS down */ + free(answer.ctn); + gras_socket_close(toserver); + gras_exit(); + INFO0("Done."); + return 0; +} /* end_of_client */ diff --git a/examples/gras/mmrpc/mmrpc_common.c b/examples/gras/mmrpc/mmrpc_common.c new file mode 100644 index 0000000000..ba4d0f50e5 --- /dev/null +++ b/examples/gras/mmrpc/mmrpc_common.c @@ -0,0 +1,40 @@ +/* $Id$ */ + +/* GridRPC - Fake Grid RPC thingy doing matrix multiplications (as expected)*/ + +/* Copyright (c) 2005 Martin Quinson. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "mmrpc.h" + +XBT_LOG_NEW_DEFAULT_CATEGORY(MatMult,"Messages specific to this example"); + +/* register messages which may be sent and their payload + (common to client and server) */ +void mmrpc_register_messages(void) { + gras_datadesc_type_t matrix_type, request_type; + + matrix_type=gras_datadesc_by_symbol(s_matrix); + request_type=gras_datadesc_array_fixed("matrix_t[2]",matrix_type,2); + + gras_msgtype_declare("answer", matrix_type); + gras_msgtype_declare("request", request_type); +} + +void mat_dump(matrix_t *mat, const char* name) { + int i,j; + + printf(">>> Matrix %s dump (%d x %d)\n",name,mat->rows,mat->cols); + for (i=0; irows; i++) { + printf(" "); + for (j=0; jcols; j++) + printf(" %.2f",mat->ctn[i*mat->cols + j]); + printf("\n"); + } + printf("<<< end_of_matrix %s dump\n",name); +} + + + diff --git a/examples/gras/mmrpc/mmrpc_server.c b/examples/gras/mmrpc/mmrpc_server.c new file mode 100644 index 0000000000..9d8bc211e7 --- /dev/null +++ b/examples/gras/mmrpc/mmrpc_server.c @@ -0,0 +1,83 @@ +/* $Id$ */ + +/* GridRPC - Fake Grid RPC thingy doing matrix multiplications (as expected)*/ + +/* Copyright (c) 2005 Martin Quinson. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#define GRAS_DEFINE_TYPE_EXTERN +#include "mmrpc.h" + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(MatMult); + + +static int server_cb_request_handler(gras_msg_cb_ctx_t ctx, void *payload_data) { + gras_socket_t expeditor=gras_msg_cb_ctx_from(ctx); + + /* 1. Get the payload into the data variable */ + matrix_t *data=(matrix_t*)payload_data; + matrix_t result; + int i,j,k; + + /* 2. Make some room to return the result */ + result.rows = data[0].rows; + result.cols = data[1].cols; + result.ctn = xbt_malloc0(sizeof(double) * result.rows * result.cols); + + /* 3. Do the computation */ + for (i=0; i>>>>>>> Connected to server which is on %s:%d <<<<<<<<", + gras_socket_peer_name(toserver),gras_socket_peer_port(toserver)); + + /* 7. Prepare and send the ping message to the server */ + ping = 1234; + TRY { + gras_msg_send(toserver, gras_msgtype_by_name("ping"), &ping); + } CATCH(e) { + gras_socket_close(toserver); + RETHROW0("Failed to send PING to server: %s"); + } + INFO3(">>>>>>>> Message PING(%d) sent to %s:%d <<<<<<<<", + ping, + gras_socket_peer_name(toserver),gras_socket_peer_port(toserver)); + + /* 8. Wait for the answer from the server, and deal with issues */ + TRY { + gras_msg_wait(6000,gras_msgtype_by_name("pong"), + &from,&pong); + } CATCH(e) { + gras_socket_close(toserver); + RETHROW0("Why can't I get my PONG message like everyone else: %s"); + } + + /* 9. Keep the user informed of what's going on, again */ + INFO3(">>>>>>>> Got PONG(%d) from %s:%d <<<<<<<<", + pong, + gras_socket_peer_name(from),gras_socket_peer_port(from)); + + /* 10. Free the allocated resources, and shut GRAS down */ + gras_socket_close(toserver); + gras_exit(); + INFO0("Done."); + return 0; +} /* end_of_client */ diff --git a/examples/gras/ping/ping_common.c b/examples/gras/ping/ping_common.c new file mode 100644 index 0000000000..eeb095c596 --- /dev/null +++ b/examples/gras/ping/ping_common.c @@ -0,0 +1,19 @@ +/* $Id$ */ + +/* ping - ping/pong demo of GRAS features */ + +/* Copyright (c) 2003, 2004, 2005 Martin Quinson. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "ping.h" +XBT_LOG_NEW_DEFAULT_CATEGORY(Ping,"Messages specific to this example"); + +/* register messages which may be sent (common to client and server) */ +void ping_register_messages(void) { + gras_msgtype_declare("ping", gras_datadesc_by_name("int")); + gras_msgtype_declare("pong", gras_datadesc_by_name("int")); + INFO0("Messages registered"); +} + diff --git a/examples/gras/ping/ping.c b/examples/gras/ping/ping_server.c similarity index 50% rename from examples/gras/ping/ping.c rename to examples/gras/ping/ping_server.c index e8780f8807..1a6c7e8c17 100644 --- a/examples/gras/ping/ping.c +++ b/examples/gras/ping/ping_server.c @@ -7,23 +7,9 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "gras.h" +#include "ping.h" -XBT_LOG_NEW_DEFAULT_CATEGORY(Ping,"Messages specific to this example"); - -/* register messages which may be sent (common to client and server) */ -static void register_messages(void) { - gras_msgtype_declare("ping", gras_datadesc_by_name("int")); - gras_msgtype_declare("pong", gras_datadesc_by_name("int")); -} - -/* Function prototypes */ -int server (int argc,char *argv[]); -int client (int argc,char *argv[]); - -/* ********************************************************************** - * Server code - * **********************************************************************/ +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(Ping); /* Global private data */ typedef struct { @@ -94,8 +80,8 @@ int server (int argc,char *argv[]) { /* 4. Register the known messages. This function is called twice here, but it's because this file also acts as regression test, no need to do so yourself of course. */ - register_messages(); - register_messages(); /* just to make sure it works ;) */ + ping_register_messages(); + ping_register_messages(); /* just to make sure it works ;) */ /* 5. Register my callback */ gras_cb_register(gras_msgtype_by_name("ping"),&server_cb_ping_handler); @@ -104,7 +90,7 @@ int server (int argc,char *argv[]) { globals->endcondition=0; /* 6. Wait up to 10 minutes for an incomming message to handle */ - gras_msg_handle(600.0); + gras_msg_handle(60.0); /* 7. Housekeeping */ if (!globals->endcondition) @@ -118,83 +104,3 @@ int server (int argc,char *argv[]) { INFO0("Done."); return 0; } /* end_of_server */ - -/* ********************************************************************** - * Client code - * **********************************************************************/ - -/* Function prototypes */ - -int client(int argc,char *argv[]) { - xbt_ex_t e; - gras_socket_t toserver=NULL; /* peer */ - - gras_socket_t from; - int ping, pong; - - const char *host = "127.0.0.1"; - int port = 4000; - - /* 1. Init the GRAS's infrastructure */ - gras_init(&argc, argv); - - /* 2. Get the server's address. The command line override defaults when specified */ - if (argc == 3) { - host=argv[1]; - port=atoi(argv[2]); - } - - INFO2("Launch client (server on %s:%d)",host,port); - - /* 3. Wait for the server startup */ - gras_os_sleep(1); - - /* 4. Create a socket to speak to the server */ - TRY { - toserver=gras_socket_client(host,port); - } CATCH(e) { - RETHROW0("Unable to connect to the server: %s"); - } - INFO2("Connected to %s:%d.",host,port); - - - /* 5. Register the messages. - See, it doesn't have to be done completely at the beginning, only before use */ - register_messages(); - - /* 6. Keep the user informed of what's going on */ - INFO2(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<", - gras_socket_peer_name(toserver),gras_socket_peer_port(toserver)); - - /* 7. Prepare and send the ping message to the server */ - ping = 1234; - TRY { - gras_msg_send(toserver, gras_msgtype_by_name("ping"), &ping); - } CATCH(e) { - gras_socket_close(toserver); - RETHROW0("Failed to send PING to server: %s"); - } - INFO3(">>>>>>>> Message PING(%d) sent to %s:%d <<<<<<<<", - ping, - gras_socket_peer_name(toserver),gras_socket_peer_port(toserver)); - - /* 8. Wait for the answer from the server, and deal with issues */ - TRY { - gras_msg_wait(6000,gras_msgtype_by_name("pong"), - &from,&pong); - } CATCH(e) { - gras_socket_close(toserver); - RETHROW0("Why can't I get my PONG message like everyone else: %s"); - } - - /* 9. Keep the user informed of what's going on, again */ - INFO3(">>>>>>>> Got PONG(%d) from %s:%d <<<<<<<<", - pong, - gras_socket_peer_name(from),gras_socket_peer_port(from)); - - /* 10. Free the allocated resources, and shut GRAS down */ - gras_socket_close(toserver); - gras_exit(); - INFO0("Done."); - return 0; -} /* end_of_client */