[C-MPI-commits] SF.net SVN: c-mpi:[111] src

[<jmw...@us...>]

Revision: 111
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=111&view=rev
Author:   jmwozniak
Date:     2010-05-13 04:44:33 +0000 (Thu, 13 May 2010)

Log Message:
-----------
Mostly works, some memory problem

Modified Paths:
--------------
    src/cmpi/cmpi.c
    src/cmpi/driver.c
    src/cmpi/node.c
    src/cmpi-cp/cmpi-cp.c
    src/dense-1/dense.c
    src/mpirpc/mpirpc.c

Modified: src/cmpi/cmpi.c
===================================================================
--- src/cmpi/cmpi.c	2010-05-13 01:16:17 UTC (rev 110)
+++ src/cmpi/cmpi.c	2010-05-13 04:44:33 UTC (rev 111)
@@ -158,7 +158,7 @@
 cmpi_cached_store(char* key, char* data, int length)
 {
   struct keyvalue* kv;
-  SHOW_FS(key);
+  SHOW_FSI(key, length);
   kv = lru_table_add(cmpi_cache, key, data, length);
   if (kv)
   {

Modified: src/cmpi/driver.c
===================================================================
--- src/cmpi/driver.c	2010-05-13 01:16:17 UTC (rev 110)
+++ src/cmpi/driver.c	2010-05-13 04:44:33 UTC (rev 111)
@@ -54,6 +54,9 @@
 
   signal(SIGPIPE, SIG_IGN);
 
+  unlink(fifo_in);
+  unlink(fifo_out);
+  
   int error = mkfifo(fifo_in, S_IRUSR|S_IWUSR);
   if (error != 0 &&
       errno != EEXIST)
@@ -127,6 +130,7 @@
   if (value == NULL)
   {
     fprintf(driver->sink, "-1\n");
+    printf("driver: doesn't exist\n");
   }
   else
   {
@@ -236,14 +240,14 @@
 void
 driver_process(cmpi_driver* driver)
 {
-  gossip_ldebug(MASK_DRIVER, "driver_process()...\n");
+  // gossip_ldebug(MASK_DRIVER, "driver_process()...\n");
   while (! driver->quitting)
   {
     char* result =
       fgets(driver->command, CMPI_DRIVER_MAX_COMMAND, driver->source);
     if (!result)
     {
-      gossip_ldebug(MASK_DRIVER, "Resetting driver...\n");
+      NOTE("Resetting driver...");
       fclose(driver->source);
       fclose(driver->sink);
       driver_setup_fifo(driver);

Modified: src/cmpi/node.c
===================================================================
--- src/cmpi/node.c	2010-05-13 01:16:17 UTC (rev 110)
+++ src/cmpi/node.c	2010-05-13 04:44:33 UTC (rev 111)
@@ -188,24 +188,32 @@
 
   sleep(1);
 
+  char hostname[128];
   /*
-  char hostname[128];
   char* buffer;
   int length = file_to_buffer(&buffer, "/etc/hostname");
   memset(hostname, 0, 128);
   memcpy(hostname, buffer, length);
   NOTE_S("hostname: ", hostname);
   */
-  
+  int error = gethostname(hostname, 128);
+  if (error)
+  {
+    printf("could not gethostname()!\n");
+    exit(1);
+  }
+
   if (cmpi_mode_select(mpi_rank, mpi_size, cmpi_nodes) ==
       CMPI_MODE_NODE)
   {
     NOTE("I am node");
+    printf("node: %i @ %s\n", mpi_rank, hostname);
     cmpi_init();
   }
   else
   {
     NOTE("I am client");
+    printf("client: %i @ %s\n", mpi_size, hostname);
     cmpi_init_client();
     cmpi_client_code();
   }

Modified: src/cmpi-cp/cmpi-cp.c
===================================================================
--- src/cmpi-cp/cmpi-cp.c	2010-05-13 01:16:17 UTC (rev 110)
+++ src/cmpi-cp/cmpi-cp.c	2010-05-13 04:44:33 UTC (rev 111)
@@ -115,7 +115,7 @@
 int
 cmpi_cp_get(char* object, FILE* file)
 {
-  // char message[64];
+  char message[64];
   char data[value_size];
   int  count, c;
   int  length;
@@ -126,10 +126,11 @@
   fprintf(to_cmpi, "get %s\n", object);
   fflush(to_cmpi);
 
-  c = fscanf(from_cmpi, "%i\n", &length);
-  // printf("message: %i\n", c);
-  // printf("message: %s\n", message);
-  // sscanf(message, "%i", &length);
+  // c = fscanf(from_cmpi, "%i\n", &length);
+  fgets(message, 64, from_cmpi);
+  //printf("message: %i\n", c);
+  printf("message: %s\n", message);
+  sscanf(message, "%i", &length);
 
   if (length == -1)
     return CMPI_DOESNT_EXIST;

Modified: src/dense-1/dense.c
===================================================================
--- src/dense-1/dense.c	2010-05-13 01:16:17 UTC (rev 110)
+++ src/dense-1/dense.c	2010-05-13 04:44:33 UTC (rev 111)
@@ -150,7 +150,7 @@
 DENSE_Translate_k(MPIRPC_Node node, DENSE_ID id)
 {
   MPIRPC* rpc =
-    MPIRPC_Call(node, heap("query_id_k"), xheap(id),
+    MPIRPC_Call(node, "query_id_k", xheap(id),
                 NULL, MPIRPC_PROCEED_NULL);
   return rpc;
 }
@@ -164,10 +164,10 @@
 {
   SHOW_FSI(key, length);
   int   klength = strlen(key);
-  int   vlength = strlen(value);
-  char* args    = malloc((klength+vlength+5)*sizeof(char));
-  assert(args);
-  strcpy(args, key);
+  // int   vlength = strlen(value);
+  // char* args    = malloc((klength+vlength+5)*sizeof(char));
+  // assert(args);
+  // strcpy(args, key);
 
   MPIRPC* rpc = MPIRPC_Call_blob(node, "store", key,
                                  value, length,

Modified: src/mpirpc/mpirpc.c
===================================================================
--- src/mpirpc/mpirpc.c	2010-05-13 01:16:17 UTC (rev 110)
+++ src/mpirpc/mpirpc.c	2010-05-13 04:44:33 UTC (rev 111)
@@ -69,7 +69,8 @@
    Time in microseconds to snooze when MPIRPC_Check() finds nothing.
    snooze() & reset_snooze() are called by MPIRPC_Wait().
 */
-unsigned int snooze_amount = 1;
+unsigned int snooze_amount_reset = 0;
+unsigned int snooze_amount = 0;
 
 /**
    The maximum amount of time to snooze in microseconds.
@@ -548,9 +549,9 @@
 {
   MPIRPC_Value* value = malloc(sizeof(MPIRPC_Value));
 
-  value->unique  = unique;
+  value->unique = unique;
   value->length = length;
-  value->result  = result;
+  value->result = result;
 
   return value;
 }
@@ -761,11 +762,12 @@
 
 void MPIRPC_Snooze_reset()
 {
-  snooze_amount = 1;
+  snooze_amount = snooze_amount_reset;
 }
 
 /**
    Convenience method for MPI_Comm_get_name().
+   Places the name in a static location.
 */
 char*
 MPIRPC_Comm_get_name(MPI_Comm comm)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.