/* 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
+#define GRAS_DEFINE_TYPE_EXTERN
+#include "xbt/matrix.h"
+#include "mmrpc.h"
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; i<mat->rows; i++) {
- printf(" ");
- for (j=0; j<mat->cols; 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) {
+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);
+ matrix_type=gras_datadesc_matrix(gras_datadesc_by_name("double"),
+ NULL);
+ request_type=gras_datadesc_array_fixed("s_matrix_t(double)[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[]);
+typedef xbt_matrix_t request_t[2];
+static int server_cb_request_handler(gras_msg_cb_ctx_t ctx,
+ void *payload_data) {
-/* **********************************************************************
- * Server code
- * **********************************************************************/
-
-static int server_cb_request_handler(gras_socket_t expeditor, 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<result.rows; i++)
- for (j=0; j<result.cols; j++)
- for (k=0; k<data[1].rows; k++)
- result.ctn[i*result.cols + j] += data[0].ctn[i*result.cols +k] *data[1].ctn[k*result.cols +j];
-
- /* 4. Send it back as payload of a pong message to the expeditor */
- gras_msg_send(expeditor, gras_msgtype_by_name("answer"), &result);
-
- /* 5. Cleanups */
- free(data[0].ctn);
- free(data[1].ctn);
- free(data);
- free(result.ctn);
+ xbt_matrix_t *request = (xbt_matrix_t*)payload_data;
+ xbt_matrix_t result;
+
+ /* 2. Do the computation */
+ result = xbt_matrix_double_new_mult(request[0], request[1]);
+
+ /* 3. Send it back as payload of a pong message to the expeditor */
+ gras_msg_send(expeditor, "answer", &result);
+
+ /* 4. Cleanups */
+ xbt_matrix_free(request[0]);
+ xbt_matrix_free(request[1]);
+ xbt_matrix_free(result);
gras_socket_close(expeditor);
- return 1;
+ return 0;
} /* end_of_server_cb_request_handler */
int server (int argc,char *argv[]) {
xbt_ex_t e;
- gras_socket_t sock;
+ gras_socket_t sock=NULL;
int port = 4000;
/* 1. Init the GRAS infrastructure */
}
/* 4. Register the known messages and payloads. */
- register_messages();
+ mmrpc_register_messages();
/* 5. Register my callback */
- gras_cb_register(gras_msgtype_by_name("request"),&server_cb_request_handler);
+ gras_cb_register("request",&server_cb_request_handler);
/* 6. Wait up to 10 minutes for an incomming message to handle */
gras_msg_handle(600.0);
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;
- matrix_t request[2], answer;
+ xbt_matrix_t request[2], answer;
int i,j;
/* 5. Register the messages (before use) */
- register_messages();
+ mmrpc_register_messages();
/* 6. Keep the user informed of what's going on */
INFO2(">>>>>>>> Connected to server which is on %s:%d <<<<<<<<",
/* 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);
+ 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);
+ 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));
/* 9. Keep the user informed of what's going on, again */
- INFO2(">>>>>>>> Got answer from %s:%d <<<<<<<<",
+ 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 */
+ xbt_matrix_free(request[1]);
+ xbt_matrix_free(answer);
gras_socket_close(toserver);
gras_exit();
INFO0("Done.");
