X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bb66fe3993929c5d1b25e4982502869d725cefd7..a5fa633fb631a244d02464b9f43de6cd4983fb99:/src/surf/sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index d476a1969a..6677aaa090 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -12,6 +12,8 @@
 #include "simgrid/platf_interface.h"
 #include "surf/surf_routing.h"
 
+#include "src/simix/smx_private.h"
+
 #include "cpu_interface.hpp"
 #include "host_interface.hpp"
 
@@ -36,7 +38,6 @@ xbt_dynar_t sg_platf_bypassASroute_cb_list = NULL; // of sg_platf_bypassASroute_
 xbt_dynar_t sg_platf_trace_cb_list = NULL;
 xbt_dynar_t sg_platf_trace_connect_cb_list = NULL;
 
-xbt_dynar_t sg_platf_storage_cb_list = NULL; // of sg_platf_storage_cb_t
 xbt_dynar_t sg_platf_storage_type_cb_list = NULL; // of sg_platf_storage_cb_t
 xbt_dynar_t sg_platf_mstorage_cb_list = NULL; // of sg_platf_storage_cb_t
 xbt_dynar_t sg_platf_mount_cb_list = NULL; // of sg_platf_storage_cb_t
@@ -80,7 +81,6 @@ void sg_platf_init(void) {
   sg_platf_trace_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_cb_t), NULL);
   sg_platf_trace_connect_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_connect_cb_t), NULL);
 
-  sg_platf_storage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
   sg_platf_storage_type_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
   sg_platf_mstorage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
   sg_platf_mount_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
@@ -113,7 +113,6 @@ void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_bypassRoute_cb_list);
   xbt_dynar_free(&sg_platf_bypassASroute_cb_list);
 
-  xbt_dynar_free(&sg_platf_storage_cb_list);
   xbt_dynar_free(&sg_platf_storage_type_cb_list);
   xbt_dynar_free(&sg_platf_mstorage_cb_list);
   xbt_dynar_free(&sg_platf_mount_cb_list);
@@ -201,12 +200,57 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet){
     fun(cabinet);
   }
 }
-void sg_platf_new_storage(sg_platf_storage_cbarg_t storage){
-  unsigned int iterator;
-  sg_platf_storage_cb_t fun;
-  xbt_dynar_foreach(sg_platf_storage_cb_list, iterator, fun) {
-    fun(storage);
+void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
+{
+  xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL),
+               "Reading a storage, processing unit \"%s\" already exists", storage->id);
+
+  // Verification of an existing type_id
+#ifndef NDEBUG
+  void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL);
+#endif
+  xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id);
+
+  XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'",
+      storage->id,
+      storage->type_id,
+      storage->content);
+
+  xbt_lib_set(storage_lib,
+      storage->id,
+      ROUTING_STORAGE_LEVEL,
+      (void *) xbt_strdup(storage->type_id));
+
+  void* stype = xbt_lib_get_or_null(storage_type_lib,
+                                    storage->type_id,
+                                    ROUTING_STORAGE_TYPE_LEVEL);
+  if(!stype) xbt_die("No storage type '%s'",storage->type_id);
+
+  // if storage content is not specified use the content of storage_type if exist
+  if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){
+    storage->content = ((storage_type_t) stype)->content;
+    storage->content_type = ((storage_type_t) stype)->content_type;
+    XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ",
+        storage->id,((storage_type_t) stype)->content_type,
+        ((storage_type_t) stype)->type_id);
   }
+
+  XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' "
+      "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' "
+      "\n\t\tproperties '%p''\n",
+      storage->id,
+      ((storage_type_t) stype)->model,
+      ((storage_type_t) stype)->type_id,
+      storage->content,
+      storage->content_type,
+      storage->properties);
+
+  surf_storage_model->createStorage(storage->id,
+                                     ((storage_type_t) stype)->type_id,
+                                     storage->content,
+                                     storage->content_type,
+                                     storage->properties,
+                                     storage->attach);
 }
 void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){
   unsigned int iterator;
@@ -279,6 +323,83 @@ void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) {
   }
 }
 
+void sg_platf_new_process(sg_platf_process_cbarg_t process)
+{
+  if (!simix_global)
+    xbt_die("Cannot create process without SIMIX.");
+
+  sg_host_t host = sg_host_by_name(process->host);
+  if (!host)
+    THROWF(arg_error, 0, "Host '%s' unknown", process->host);
+  xbt_main_func_t parse_code = SIMIX_get_registered_function(process->function);
+  xbt_assert(parse_code, "Function '%s' unknown", process->function);
+
+  double start_time = process->start_time;
+  double kill_time  = process->kill_time;
+  int auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1;
+
+  smx_process_arg_t arg = NULL;
+  smx_process_t process_created = NULL;
+
+  arg = xbt_new0(s_smx_process_arg_t, 1);
+  arg->code = parse_code;
+  arg->data = NULL;
+  arg->hostname = sg_host_get_name(host);
+  arg->argc = process->argc;
+  arg->argv = xbt_new(char *,process->argc);
+  int i;
+  for (i=0; i<process->argc; i++)
+    arg->argv[i] = xbt_strdup(process->argv[i]);
+  arg->name = xbt_strdup(arg->argv[0]);
+  arg->kill_time = kill_time;
+  arg->properties = current_property_set;
+  if (!sg_host_simix(host)->boot_processes) {
+    sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg);
+  }
+  xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
+
+  if (start_time > SIMIX_get_clock()) {
+    arg = xbt_new0(s_smx_process_arg_t, 1);
+    arg->name = (char*)(process->argv)[0];
+    arg->code = parse_code;
+    arg->data = NULL;
+    arg->hostname = sg_host_get_name(host);
+    arg->argc = process->argc;
+    arg->argv = (char**)(process->argv);
+    arg->kill_time = kill_time;
+    arg->properties = current_property_set;
+
+    XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name,
+           arg->hostname, start_time);
+    SIMIX_timer_set(start_time, [](void* arg) {
+      SIMIX_process_create_from_wrapper((smx_process_arg_t) arg);
+    }, arg);
+  } else {                      // start_time <= SIMIX_get_clock()
+    XBT_DEBUG("Starting Process %s(%s) right now", process->argv[0], sg_host_get_name(host));
+
+    if (simix_global->create_process_function)
+      process_created = simix_global->create_process_function(
+                                            (char*)(process->argv)[0],
+                                            parse_code,
+                                            NULL,
+                                            sg_host_get_name(host),
+                                            kill_time,
+                                            process->argc,
+                                            (char**)(process->argv),
+                                            current_property_set,
+                                            auto_restart, NULL);
+    else
+      process_created = simcall_process_create((char*)(process->argv)[0], parse_code, NULL, sg_host_get_name(host), kill_time, process->argc,
+          (char**)process->argv, current_property_set,auto_restart);
+
+    /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
+    if (!process_created) {
+      return;
+    }
+  }
+  current_property_set = NULL;
+}
+
 void sg_platf_route_begin (sg_platf_route_cbarg_t route){
   route->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
@@ -394,9 +515,6 @@ void sg_platf_AS_begin_add_cb(sg_platf_AS_cb_t fct) {
 void sg_platf_AS_end_add_cb(sg_platf_AS_cb_t fct) {
   xbt_dynar_push(sg_platf_AS_end_cb_list, &fct);
 }
-void sg_platf_storage_add_cb(sg_platf_storage_cb_t fct) {
-  xbt_dynar_push(sg_platf_storage_cb_list, &fct);
-}
 void sg_platf_storage_type_add_cb(sg_platf_storage_type_cb_t fct) {
   xbt_dynar_push(sg_platf_storage_type_cb_list, &fct);
 }