Starting the network module.

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

diff --git a/src/surf/network.c b/src/surf/network.c
new file mode 100644 (file)
index 0000000..dc85477
--- /dev/null
+++ b/src/surf/network.c
@@ -0,0 +1,161 @@
+/* Authors: Arnaud Legrand                                                  */
+
+/* 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 "network_private.h"
+#include "xbt/dict.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf ,"Logging specific to the SURF network module");
+
+surf_network_resource_t surf_network_resource = NULL;
+
+static xbt_dict_t network_set = NULL;
+
+
+static void *route_new(const char *src, const char* dst)
+{
+  return NULL;
+}
+
+/*  
+   Semantic:  name       scale     initial     power     initial     state
+                                    power      trace      state      trace
+   
+   Token:   TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD
+   Type:     string      float      float      string     ON/OFF     string
+*/
+
+static void parse_route(void)
+{
+  route_new(NULL,NULL);
+}
+
+static void parse_file(const char *file)
+{
+  e_surf_token_t token;
+
+  find_section(file,"NETWORK");
+
+  while(1) {
+    token=surf_parse();
+
+    if(token==TOKEN_END_SECTION) break;
+    if(token==TOKEN_NEWLINE) continue;
+    
+    if(token==TOKEN_WORD) parse_route();
+    else {CRITICAL1("Parse error line %d\n",line_pos);xbt_abort();}
+  }
+
+  close_section("NETWORK");  
+}
+
+static void *name_service(const char *name)
+{
+  return NULL;
+}
+
+static const char *get_resource_name(void *resource_id)
+{
+  return NULL;
+}
+
+static int resource_used(void *resource_id)
+{
+  return 0;
+}
+
+static void action_free(surf_action_t action)
+{
+  return;
+}
+
+static void action_cancel(surf_action_t action)
+{
+  return;
+}
+
+static void action_recycle(surf_action_t action)
+{
+  return;
+}
+
+static void action_change_state(surf_action_t action, e_surf_action_state_t state)
+{
+  return;
+}
+
+static xbt_heap_float_t share_resources(xbt_heap_float_t now)
+{
+  return -1.0;
+}
+
+static void update_actions_state(xbt_heap_float_t now,
+                                xbt_heap_float_t delta)
+{
+  return;
+}
+
+static void update_resource_state(void *id,
+                                 tmgr_trace_event_t event_type, 
+                                 xbt_maxmin_float_t value)
+{
+  return;
+}
+
+static surf_action_t communicate(void *src, void *dst, xbt_maxmin_float_t size)
+{
+  return NULL;
+}
+
+static void finalize(void)
+{
+}
+
+static void surf_network_resource_init_internal(void)
+{
+  s_surf_action_t action;
+
+  surf_network_resource = xbt_new0(s_surf_network_resource_t,1);
+  
+  surf_network_resource->common_private = xbt_new0(s_surf_resource_private_t,1);
+  surf_network_resource->common_public = xbt_new0(s_surf_resource_public_t,1);
+/*   surf_network_resource->extension_private = xbt_new0(s_surf_network_resource_extension_private_t,1); */
+  surf_network_resource->extension_public = xbt_new0(s_surf_network_resource_extension_public_t,1);
+
+  surf_network_resource->common_public->states.ready_action_set=
+    xbt_swag_new(xbt_swag_offset(action,state_hookup));
+  surf_network_resource->common_public->states.running_action_set=
+    xbt_swag_new(xbt_swag_offset(action,state_hookup));
+  surf_network_resource->common_public->states.failed_action_set=
+    xbt_swag_new(xbt_swag_offset(action,state_hookup));
+  surf_network_resource->common_public->states.done_action_set=
+    xbt_swag_new(xbt_swag_offset(action,state_hookup));
+
+  surf_network_resource->common_public->name_service = name_service;
+  surf_network_resource->common_public->get_resource_name = get_resource_name;
+  surf_network_resource->common_public->resource_used = resource_used;
+  surf_network_resource->common_public->action_get_state=surf_action_get_state;
+  surf_network_resource->common_public->action_free = action_free;
+  surf_network_resource->common_public->action_cancel = action_cancel;
+  surf_network_resource->common_public->action_recycle = action_recycle;
+  surf_network_resource->common_public->action_change_state = action_change_state;
+
+  surf_network_resource->common_private->share_resources = share_resources;
+  surf_network_resource->common_private->update_actions_state = update_actions_state;
+  surf_network_resource->common_private->update_resource_state = update_resource_state;
+  surf_network_resource->common_private->finalize = finalize;
+
+  surf_network_resource->extension_public->communicate = communicate;
+
+  network_set = xbt_dict_new();
+
+  xbt_assert0(maxmin_system,"surf_init has to be called first!");
+}
+
+void surf_network_resource_init(const char* filename)
+{
+  surf_network_resource_init_internal();
+  parse_file(filename);
+  xbt_dynar_push(resource_list, &surf_network_resource);
+}

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
new file mode 100644 (file)
index 0000000..0f58113
--- /dev/null
+++ b/src/surf/network_private.h
@@ -0,0 +1,23 @@
+/* Authors: Arnaud Legrand                                                  */
+
+/* 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. */
+
+#ifndef _SURF_NETWORK_PRIVATE_H
+#define _SURF_NETWORK_PRIVATE_H
+
+#include "surf_private.h"
+
+typedef struct surf_action_network {
+  s_surf_action_t generic_action;
+  lmm_variable_t variable;
+} s_surf_action_network_t, *surf_action_network_t;
+
+typedef struct network {
+  surf_resource_t resource;   /* Any such object, added in a trace
+                                should start by this field!!! */
+  const char *name;
+} s_network_t, *network_t;
+
+
+#endif                         /* _SURF_NETWORK_PRIVATE_H */

diff --git a/testsuite/surf/platform.txt b/testsuite/surf/platform.txt
index cd6f270..fba1b8a 100644 (file)
--- a/testsuite/surf/platform.txt
+++ b/testsuite/surf/platform.txt
@@ -3,4 +3,9 @@
   "Cpu A" 100.00 1.0 trace_A.txt ON trace_A_failure.txt
   "Cpu B" 100.00 1.0 trace_B.txt ON  ""
        
-</CPU>
\ No newline at end of file
+</CPU>
+
+
+
+  <NETWORK>  /* The network section */
+</NETWORK>

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index e07e775..c3cb03b 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -41,6 +41,7 @@ void test(void)
 
   surf_init(); /* Initialize some common structures */
   surf_cpu_resource_init("platform.txt"); /* Now it is possible to use CPUs */
+  surf_network_resource_init("platform.txt"); /* Now it is possible to use CPUs */
 
   printf("%p \n", surf_cpu_resource);
   cpuA = surf_cpu_resource->common_public->name_service("Cpu A");