Perf improvement: Change libdata to a set so that we can search for stuff by ID ...

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

diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c
index 7a22286..9b6c65c 100644 (file)
--- a/src/gras/Virtu/process.c
+++ b/src/gras/Virtu/process.c
@@ -37,8 +37,9 @@ static void gras_procdata_fabric_free(void *fab) {
 /** @brief declare the functions in charge of creating/destructing the procdata of a module
  *  
  *  This is intended to be called from the gras_<module>_register function.
 /** @brief declare the functions in charge of creating/destructing the procdata of a module
  *  
  *  This is intended to be called from the gras_<module>_register function.

+ *  This returns the module ID you can use for gras_libdata_by_id()

  */
  */

-void gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t destructor) {
+int gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t destructor) {

    
    gras_procdata_fabric_t fab;
    
    
    gras_procdata_fabric_t fab;
    


@@ -53,6 +54,7 @@ void gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t d
    fab->name       = xbt_strdup(name);
    fab->creator    = creator;
    fab->destructor = destructor;
    fab->name       = xbt_strdup(name);
    fab->creator    = creator;
    fab->destructor = destructor;

+   return xbt_dynar_length(_gras_procdata_fabrics)-1;

 }
 
 /* **************************************************************************
 }
 
 /* **************************************************************************


@@ -69,19 +71,24 @@ void gras_userdata_set(void *ud) {
   pd->userdata = ud;
 }
 
   pd->userdata = ud;
 }
 

-void *gras_libdata_get(const char *name) {
+void *gras_libdata_by_name(const char *name) {

   gras_procdata_t *pd=gras_procdata_get();
   void *res=NULL;
   xbt_ex_t e;
    
   TRY {
   gras_procdata_t *pd=gras_procdata_get();
   void *res=NULL;
   xbt_ex_t e;
    
   TRY {

-    res = xbt_dict_get(pd->libdata, name);
+    res = xbt_set_get_by_name(pd->libdata, name);

   } CATCH(e) {
     RETHROW1("Cannot retrive the libdata associated to %s: %s",name);
   }   
   return res;
 }
 
   } CATCH(e) {
     RETHROW1("Cannot retrive the libdata associated to %s: %s",name);
   }   
   return res;
 }
 

+void *gras_libdata_by_id(int id) {
+  gras_procdata_t *pd=gras_procdata_get();
+  return xbt_set_get_by_id(pd->libdata, id);
+}
+

 void
 gras_procdata_init() {
   gras_procdata_t *pd=gras_procdata_get();
 void
 gras_procdata_init() {
   gras_procdata_t *pd=gras_procdata_get();


@@ -93,7 +100,7 @@ gras_procdata_init() {
   void *data;
 
   pd->userdata  = NULL;
   void *data;
 
   pd->userdata  = NULL;

-  pd->libdata   = xbt_dict_new();
+  pd->libdata   = xbt_set_new();

    
   xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){
     volatile int found = 0;
    
   xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){
     volatile int found = 0;


@@ -102,7 +109,7 @@ gras_procdata_init() {
     DEBUG1("Create the procdata for %s",fab.name);
     /* Check for our own errors */
     TRY {
     DEBUG1("Create the procdata for %s",fab.name);
     /* Check for our own errors */
     TRY {

-      data = xbt_dict_get(pd->libdata, fab.name);
+      data = xbt_set_get_by_name(pd->libdata, fab.name);

       found = 1;
     } CATCH(e) {
       xbt_ex_free(e);
       found = 1;
     } CATCH(e) {
       xbt_ex_free(e);


@@ -112,7 +119,7 @@ gras_procdata_init() {
       THROW1(unknown_error,0,"MayDay: two modules use '%s' as libdata name", fab.name);
     
     /* Add the data in place */
       THROW1(unknown_error,0,"MayDay: two modules use '%s' as libdata name", fab.name);
     
     /* Add the data in place */

-    xbt_dict_set(pd->libdata, fab.name, (fab.creator)(), fab.destructor);
+    xbt_set_add(pd->libdata, (fab.creator)(), fab.destructor);

   }
 }
 
   }
 }
 


@@ -121,7 +128,7 @@ gras_procdata_exit() {
   int len;
   gras_procdata_t *pd=gras_procdata_get();
 
   int len;
   gras_procdata_t *pd=gras_procdata_get();
 

-  xbt_dict_free(&( pd->libdata ));
+  xbt_set_free(&( pd->libdata ));

   
   /* Remove procdata in reverse order wrt creation */
   while ((len=xbt_dynar_length(_gras_procdata_fabrics))) {
   
   /* Remove procdata in reverse order wrt creation */
   while ((len=xbt_dynar_length(_gras_procdata_fabrics))) {

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index 6432e9e..8c32f14 100644 (file)
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -41,7 +41,7 @@ gras_process_init() {
   }
   
   /* take a free channel for this process */
   }
   
   /* take a free channel for this process */

-  trp_pd = (gras_trp_procdata_t)gras_libdata_get("gras_trp");
+  trp_pd = (gras_trp_procdata_t)gras_libdata_by_name("gras_trp");

   for (i=0; i<XBT_MAX_CHANNEL && hd->proc[i]; i++);
   if (i == XBT_MAX_CHANNEL) 
     THROW2(system_error,0,
   for (i=0; i<XBT_MAX_CHANNEL && hd->proc[i]; i++);
   if (i == XBT_MAX_CHANNEL) 
     THROW2(system_error,0,


@@ -82,8 +82,8 @@ gras_process_init() {
 void
 gras_process_exit() {
   gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
 void
 gras_process_exit() {
   gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());

-  gras_msg_procdata_t msg_pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
-  gras_trp_procdata_t trp_pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp");
+  gras_msg_procdata_t msg_pd=(gras_msg_procdata_t)gras_libdata_by_name("gras_msg");
+  gras_trp_procdata_t trp_pd=(gras_trp_procdata_t)gras_libdata_by_name("gras_trp");

   int myPID=MSG_process_self_PID();
   int cpt;
   gras_sg_portrec_t pr;
   int myPID=MSG_process_self_PID();
   int cpt;
   gras_sg_portrec_t pr;

diff --git a/src/gras/Virtu/virtu_interface.h b/src/gras/Virtu/virtu_interface.h
index 0f79d15..72e6840 100644 (file)
--- a/src/gras/Virtu/virtu_interface.h
+++ b/src/gras/Virtu/virtu_interface.h
@@ -14,8 +14,7 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"

-#include "xbt/dynar.h"
-#include "xbt/dict.h"
+#include "xbt/set.h"

 #include "gras/virtu.h"
 #include "gras/process.h"
 
 #include "gras/virtu.h"
 #include "gras/process.h"
 


@@ -24,7 +23,8 @@
 
 typedef void* (pvoid_f_void_t)(void); /* FIXME: find a better place for it */
 
 
 typedef void* (pvoid_f_void_t)(void); /* FIXME: find a better place for it */
 

-void gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t destructor);
-void *gras_libdata_get(const char *name);
+int gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t destructor);
+void *gras_libdata_by_name(const char *name);
+void *gras_libdata_by_id(int id);

 
 #endif  /* GRAS_VIRTU_INTERFACE_H */
 
 #endif  /* GRAS_VIRTU_INTERFACE_H */

diff --git a/src/gras/Virtu/virtu_private.h b/src/gras/Virtu/virtu_private.h
index 0a677a9..b44246a 100644 (file)
--- a/src/gras/Virtu/virtu_private.h
+++ b/src/gras/Virtu/virtu_private.h
@@ -22,7 +22,7 @@ typedef struct {
 
   /* data specific to each process for each module. 
      Registered with gras_procdata_add(), retrieved with gras_libdata_get() */
 
   /* data specific to each process for each module. 
      Registered with gras_procdata_add(), retrieved with gras_libdata_get() */

-  xbt_dict_t libdata;
+  xbt_set_t libdata;

 } gras_procdata_t;
 
 gras_procdata_t *gras_procdata_get(void);
 } gras_procdata_t;
 
 gras_procdata_t *gras_procdata_get(void);

diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h
index 4df4e09..b279486 100644 (file)
--- a/src/gras/Virtu/virtu_sg.h
+++ b/src/gras/Virtu/virtu_sg.h
@@ -11,6 +11,7 @@
 #define VIRTU_SG_H
 
 #include "gras/Virtu/virtu_private.h"
 #define VIRTU_SG_H
 
 #include "gras/Virtu/virtu_private.h"

+#include "xbt/dynar.h"

 #include "msg/msg.h" /* SimGrid header */
 
 #define XBT_MAX_CHANNEL 10
 #include "msg/msg.h" /* SimGrid header */
 
 #define XBT_MAX_CHANNEL 10