X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/612ca769b37fe934c8b17abe1eb17f2fa9817b6e..6270ece7967b322385bbff766ee5f882ba1ef2a2:/src/surf/network_interface.cpp?ds=sidebyside

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index bbe24203e6..3daac06b85 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -17,27 +17,70 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
  * C API *
  *********/
 SG_BEGIN_DECL()
-int surf_network_link_is_shared(Link *link){
-  return link->isShared();
+const char* sg_link_name(Link *link) {
+  return link->getName();
+}
+Link * sg_link_by_name(const char* name) {
+  return Link::byName(name);
 }
-double surf_network_link_get_bandwidth(Link *link){
+
+int sg_link_is_shared(Link *link){
+  return link->sharingPolicy();
+}
+double sg_link_bandwidth(Link *link){
   return link->getBandwidth();
 }
-double surf_network_link_get_latency(Link *link){
+double sg_link_latency(Link *link){
   return link->getLatency();
 }
-const char* surf_network_link_get_name(Link *link) {
-  return link->getName();
-}
-void* surf_network_link_data(Link *link) {
+void* sg_link_data(Link *link) {
 	return link->getData();
 }
-void surf_network_link_data_set(Link *link,void *data) {
+void sg_link_data_set(Link *link,void *data) {
 	link->setData(data);
 }
-
+int sg_link_amount(void) {
+	return Link::linksAmount();
+}
+Link** sg_link_list(void) {
+	return Link::linksList();
+}
+void sg_link_exit(void) {
+	Link::linksExit();
+}
 SG_END_DECL()
-
+/*****************
+ * List of links *
+ *****************/
+
+boost::unordered_map<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
+Link *Link::byName(const char* name) {
+	  Link * res = NULL;
+	  try {
+		  res = links->at(name);
+	  } catch (std::out_of_range& e) {}
+
+	  return res;
+}
+/** @brief Returns the amount of links in the platform */
+int Link::linksAmount() {
+	  return links->size();
+}
+/** @brief Returns a list of all existing links */
+Link **Link::linksList() {
+	  Link **res = xbt_new(Link*, (int)links->size());
+	  int i=0;
+	  for (auto kv : *links) {
+		  res[i++] = kv.second;
+	  }
+	  return res;
+}
+/** @brief destructor of the static data */
+void Link::linksExit() {
+	for (auto kv : *links)
+		delete (kv.second);
+	delete links;
+}
 /*************
  * Callbacks *
  *************/
@@ -45,8 +88,8 @@ SG_END_DECL()
 surf_callback(void, Link*) networkLinkCreatedCallbacks;
 surf_callback(void, Link*) networkLinkDestructedCallbacks;
 surf_callback(void, Link*, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks;
-surf_callback(void, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks;
-surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate) networkCommunicateCallbacks;
+surf_callback(void, NetworkAction*, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks;
+surf_callback(void, NetworkAction*, RoutingEdge *src, RoutingEdge *dst, double size, double rate) networkCommunicateCallbacks;
 
 void netlink_parse_init(sg_platf_link_cbarg_t link){
   if (link->policy == SURF_LINK_FULLDUPLEX) {
@@ -88,7 +131,7 @@ void net_add_traces(){
  * Model *
  *********/
 
-NetworkModelPtr surf_network_model = NULL;
+NetworkModel *surf_network_model = NULL;
 
 double NetworkModel::latencyFactor(double /*size*/) {
   return sg_latency_factor;
@@ -104,15 +147,15 @@ double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /
 
 double NetworkModel::shareResourcesFull(double now)
 {
-  NetworkActionPtr action = NULL;
-  ActionListPtr runningActions = surf_network_model->getRunningActionSet();
+  NetworkAction *action = NULL;
+  ActionList *runningActions = surf_network_model->getRunningActionSet();
   double minRes;
 
   minRes = shareResourcesMaxMin(runningActions, surf_network_model->p_maxminSystem, surf_network_model->f_networkSolve);
 
   for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
        ; it != itend ; ++it) {
-      action = static_cast<NetworkActionPtr>(&*it);
+      action = static_cast<NetworkAction*>(&*it);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
     if (lmm_is_variable_limited_by_latency(action->getVariable())) {
       action->m_latencyLimited = 1;
@@ -134,23 +177,28 @@ double NetworkModel::shareResourcesFull(double now)
  * Resource *
  ************/
 
-Link::Link(NetworkModelPtr model, const char *name, xbt_dict_t props)
+Link::Link(NetworkModel *model, const char *name, xbt_dict_t props)
 : Resource(model, name, props)
 , p_latEvent(NULL)
 {
-  surf_callback_emit(networkLinkCreatedCallbacks, this);
+  links->insert({name, this});
+
+  XBT_DEBUG("Create link '%s'",name);
 }
 
-Link::Link(NetworkModelPtr model, const char *name, xbt_dict_t props,
+Link::Link(NetworkModel *model, const char *name, xbt_dict_t props,
 		                 lmm_constraint_t constraint,
 	                     tmgr_history_t history,
 	                     tmgr_trace_t state_trace)
 : Resource(model, name, props, constraint),
   p_latEvent(NULL)
 {
-  surf_callback_emit(networkLinkCreatedCallbacks, this);
   if (state_trace)
     p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this);
+
+  links->insert({name, this});
+  XBT_DEBUG("Create link '%s'",name);
+
 }
 
 Link::~Link()
@@ -173,9 +221,9 @@ double Link::getBandwidth()
   return p_power.peak * p_power.scale;
 }
 
-bool Link::isShared()
+int Link::sharingPolicy()
 {
-  return lmm_constraint_is_shared(getConstraint());
+  return lmm_constraint_sharing_policy(getConstraint());
 }
 
 void Link::setState(e_surf_resource_state_t state){
@@ -184,6 +232,8 @@ void Link::setState(e_surf_resource_state_t state){
   surf_callback_emit(networkLinkStateChangedCallbacks, this, old, state);
 }
 
+
+
 /**********
  * Action *
  **********/