Renamed any gras stuff that was in xbt and should therefore be called

[simgrid.git] / src / gras / Virtu / rl_process.c

diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c
index 10066a6..e7343c1 100644 (file)
--- a/src/gras/Virtu/rl_process.c
+++ b/src/gras/Virtu/rl_process.c
@@ -8,30 +8,21 @@
 /* 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 "Virtu/virtu_rl.h"
+#include "gras/Virtu/virtu_rl.h"
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(process,GRAS);
-                             
-/* globals */
-static gras_process_data_t *_gras_process_data;
-
-gras_error_t gras_process_init() {
-  //  gras_error_t errcode;
-
-  if (!(_gras_process_data=(gras_process_data_t *)malloc(sizeof(gras_process_data_t))))
-    RAISE_MALLOC;
+XBT_LOG_EXTERNAL_CATEGORY(process);
+XBT_LOG_DEFAULT_CATEGORY(process);
 
-  WARNING0("Implement message queue");
-  /*
-  TRY(gras_dynar_new(  &(_gras_process_data->msg_queue)  ));
-  TRY(gras_dynar_new(  &(_gras_process_data->cbl_list)  ));
-  */
+/* globals */
+static gras_procdata_t *_gras_procdata = NULL;
 
-  _gras_process_data->userdata = NULL;
+xbt_error_t gras_process_init() {
+  _gras_procdata=xbt_new(gras_procdata_t,1);
+  gras_procdata_init();
   return no_error;
 }
-gras_error_t gras_process_exit() {
-  WARNING0("FIXME: not implemented (=> leaking on exit :)");
+xbt_error_t gras_process_exit() {
+  gras_procdata_exit();
   return no_error;
 }
 
@@ -39,11 +30,8 @@ gras_error_t gras_process_exit() {
  * Process data
  * **************************************************************************/
 
-void *gras_userdata_get(void) {
-  return _gras_process_data->userdata;
-}
+gras_procdata_t *gras_procdata_get(void) {
+  xbt_assert0(_gras_procdata,"Run gras_process_init!");
 
-void *gras_userdata_set(void *ud) {
-  _gras_process_data->userdata = ud;
-  return ud;
+  return _gras_procdata;
 }