Switch to xbt_matrix_t

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2367 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/gras/mmrpc/mmrpc.h b/examples/gras/mmrpc/mmrpc.h
index d33d1c8..781d05a 100644 (file)
--- a/examples/gras/mmrpc/mmrpc.h
+++ b/examples/gras/mmrpc/mmrpc.h
@@ -14,16 +14,6 @@
 
 #define MATSIZE 128
 
-GRAS_DEFINE_TYPE(s_matrix,
-struct s_matrix {
-  int lines;
-  int rows;
-  double *ctn GRAS_ANNOTE(size, lines*rows);
-};)
-typedef struct s_matrix matrix_t;
-
-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);

diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c
index 2e45edb..acffc9e 100644 (file)
--- a/examples/gras/mmrpc/mmrpc_client.c
+++ b/examples/gras/mmrpc/mmrpc_client.c
@@ -8,6 +8,7 @@
  * 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);
@@ -17,7 +18,7 @@ int client(int argc,char *argv[]) {
   gras_socket_t toserver=NULL; /* peer */
 
   gras_socket_t from;
-  matrix_t request[2], answer;
+  xbt_matrix_t request[2], answer;
 
   int i,j;
 
@@ -56,23 +57,17 @@ int client(int argc,char *argv[]) {
 
   /* 7. Prepare and send the request to the server */
 
-  request[0].lines=request[0].rows=request[1].lines=request[1].rows=MATSIZE;
+  request[0] = xbt_matrix_double_new_id(MATSIZE,MATSIZE);
+  request[1] = xbt_matrix_double_new_rand(MATSIZE,MATSIZE);
 
-  request[0].ctn=xbt_malloc0(sizeof(double)*MATSIZE*MATSIZE);
-  request[1].ctn=xbt_malloc0(sizeof(double)*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);
 
-  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));
@@ -80,16 +75,23 @@ int client(int argc,char *argv[]) {
   /* 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);
+  /*
+  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 */
-  free(answer.ctn);
+  xbt_matrix_free(request[1]);
+  xbt_matrix_free(answer);
   gras_socket_close(toserver);
   gras_exit();
   INFO0("Done.");

diff --git a/examples/gras/mmrpc/mmrpc_common.c b/examples/gras/mmrpc/mmrpc_common.c
index 27dc89e..65719cc 100644 (file)
--- a/examples/gras/mmrpc/mmrpc_common.c
+++ b/examples/gras/mmrpc/mmrpc_common.c
@@ -16,25 +16,14 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(MatMult,"Messages specific to this example");
 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_datadesc_by_name("xbt_matrix_t(double)"),2);
+  //    request_type=gras_datadesc_ref("matrix_t(double)[2]",request_type);
   
   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->lines,mat->rows);
-  for (i=0; i<mat->lines; i++) {
-    printf("  ");
-    for (j=0; j<mat->rows; j++)
-      printf(" %.2f",mat->ctn[i*mat->rows + 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
index 8d94a0d..671b97c 100644 (file)
--- a/examples/gras/mmrpc/mmrpc_server.c
+++ b/examples/gras/mmrpc/mmrpc_server.c
@@ -8,37 +8,32 @@
  * 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 */
+  /* 3. 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(result.ctn);
+  /* 4. Cleanups */
+  xbt_matrix_free(request[0]);
+  xbt_matrix_free(request[1]);
+  xbt_matrix_free(result);
   gras_socket_close(expeditor);
    
   return 1;