* under the terms of the license (GNU LGPL) which comes with this package. */
#define GRAS_DEFINE_TYPE_EXTERN
+#include "xbt/matrix.h"
#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 */
+ int connected = 0;
gras_socket_t from;
- matrix_t request[2], answer;
+ xbt_matrix_t request[2], answer;
int i,j;
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");
+ /* 3. Create a socket to speak to the server */
+ while (!connected) {
+ TRY {
+ toserver=gras_socket_client(host,port);
+ connected=1;
+ } CATCH(e) {
+ if (e.category != system_error)
+ RETHROW0("Unable to connect to the server: %s");
+ xbt_ex_free(e);
+ gras_os_sleep(0.05);
+ }
}
INFO2("Connected to %s:%d.",host,port);
- /* 5. Register the messages (before use) */
+ /* 4. Register the messages (before use) */
mmrpc_register_messages();
- /* 6. Keep the user informed of what's going on */
+ /* 5. 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;
+ /* 6. Prepare and send the request to the server */
- request[0].ctn=xbt_malloc0(sizeof(double)*MATSIZE*MATSIZE);
- request[1].ctn=xbt_malloc0(sizeof(double)*MATSIZE*MATSIZE);
+ request[0] = xbt_matrix_double_new_id(MATSIZE,MATSIZE);
+ request[1] = xbt_matrix_double_new_rand(MATSIZE,MATSIZE);
- for (i=0; i<MATSIZE; i++) {
- request[0].ctn[i*MATSIZE+i] = 1;
- for (j=0; j<MATSIZE; j++)
- request[1].ctn[i*MATSIZE+j] = i*MATSIZE+j;
- }
- /* mat_dump(&request[0],"C:sent0");*/
- /* mat_dump(&request[1],"C:sent1");*/
+ /*
+ xbt_matrix_dump(request[0],"C:sent0",0,xbt_matrix_dump_display_double);
+ xbt_matrix_dump(request[1],"C:sent1",0,xbt_matrix_dump_display_double);
+ */
- gras_msg_send(toserver, gras_msgtype_by_name("request"), &request);
+ gras_msg_send(toserver, "request", &request);
- free(request[0].ctn);
- free(request[1].ctn);
+ xbt_matrix_free(request[0]);
INFO2(">>>>>>>> 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<MATSIZE*MATSIZE; i++)
- xbt_assert(answer.ctn[i]==i);
-
- /* 9. Keep the user informed of what's going on, again */
- INFO2(">>>>>>>> Got answer from %s:%d <<<<<<<<",
+ /* 7. Wait for the answer from the server, and deal with issues */
+ gras_msg_wait(6000,"answer",&from,&answer);
+
+ /*
+ xbt_matrix_dump(answer,"C:answer",0,xbt_matrix_dump_display_double);
+ */
+ for (i=0; i<MATSIZE; i++)
+ for (j=0; i<MATSIZE; i++)
+ xbt_assert4(xbt_matrix_get_as(answer,i,j,double)==xbt_matrix_get_as(request[1],i,j,double),
+ "Answer does not match expectations. Found %f at cell %d,%d instead of %f",
+ xbt_matrix_get_as(answer,i,j,double),i,j,
+ xbt_matrix_get_as(request[1],i,j,double));
+
+ /* 8. Keep the user informed of what's going on, again */
+ INFO2(">>>>>>>> Got answer from %s:%d (values are right) <<<<<<<<",
gras_socket_peer_name(from),gras_socket_peer_port(from));
- /* 10. Free the allocated resources, and shut GRAS down */
- free(answer.ctn);
+ /* 9. Free the allocated resources, and shut GRAS down */
+ xbt_matrix_free(request[1]);
+ xbt_matrix_free(answer);
gras_socket_close(toserver);
gras_exit();
- INFO0("Done.");
return 0;
} /* end_of_client */
