X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ba6247845b00a203edbc22f64c50a43f047fcdd..33d399c1fa8847652ab2698ed6d7263bccb17447:/examples/gras/mmrpc/mmrpc_server.c

diff --git a/examples/gras/mmrpc/mmrpc_server.c b/examples/gras/mmrpc/mmrpc_server.c
index 8d94a0d9c0..95d70d5a3a 100644
--- a/examples/gras/mmrpc/mmrpc_server.c
+++ b/examples/gras/mmrpc/mmrpc_server.c
@@ -8,40 +8,35 @@
  * 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);
 
 
-static int server_cb_request_handler(gras_msg_cb_ctx_t ctx, void *payload_data) {
+typedef xbt_matrix_t request_t[2];
+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.lines = data[0].lines;
-  result.rows = data[1].rows;
-  result.ctn = xbt_malloc0(sizeof(double) * result.lines * result.rows);
-
-  /* 3. Do the computation */
-  for (i=0; i<result.lines; i++) 
-    for (j=0; j<result.rows; j++) 
-      for (k=0; k<data[1].lines; k++) 
-	result.ctn[i*result.rows + j] +=  data[0].ctn[i*result.rows +k] *data[1].ctn[k*result.rows +j];
+  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]);
 
-  /* 4. Send it back as payload of a pong message to the expeditor */
-  gras_msg_send(expeditor, gras_msgtype_by_name("answer"), &result);
+  /* 3. Send it back as payload of a pong message to the expeditor */
+  gras_msg_send(expeditor, "answer", &result);
 
-  /* 5. Cleanups */
-  free(data[0].ctn); 
-  free(data[1].ctn);
-  free(result.ctn);
+  /* 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[]) {
@@ -69,7 +64,7 @@ int server (int argc,char *argv[]) {
   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);
@@ -78,6 +73,5 @@ int server (int argc,char *argv[]) {
   gras_socket_close(sock);
   gras_exit();
    
-  INFO0("Done.");
   return 0;
 } /* end_of_server */