X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edab1d82e659722994c64246d5858eca2ff6703d..49e85177c669d793e84242983a1b1f430e47184e:/src/surf/workstation_interface.cpp

diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp
index b6df595de5..1b41b0cf1a 100644
--- a/src/surf/workstation_interface.cpp
+++ b/src/surf/workstation_interface.cpp
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* 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 "workstation_interface.hpp"
 #include "vm_workstation_interface.hpp"
 #include "cpu_cas01.hpp"
@@ -8,6 +14,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
 
 WorkstationModelPtr surf_workstation_model = NULL;
 
+/*************
+ * Callbacks *
+ *************/
+
+surf_callback(void, WorkstationPtr) workstationCreatedCallbacks;
+surf_callback(void, WorkstationPtr) workstationDestructedCallbacks;
+surf_callback(void, WorkstationPtr) workstationStateChangedCallbacks;
+surf_callback(void, WorkstationActionPtr) workstationActionStateChangedCallbacks;
+
 /*********
  * Model *
  *********/
@@ -25,32 +40,20 @@ WorkstationModel::WorkstationModel()
 WorkstationModel::~WorkstationModel() {
 }
 
-
-
 /* Each VM has a dummy CPU action on the PM layer. This CPU action works as the
  * constraint (capacity) of the VM in the PM layer. If the VM does not have any
  * active task, the dummy CPU action must be deactivated, so that the VM does
  * not get any CPU share in the PM layer. */
 void WorkstationModel::adjustWeightOfDummyCpuActions()
 {
-  /* iterate for all hosts including virtual machines */
-  xbt_lib_cursor_t cursor;
-  char *key;
-  void **ind_host;
-
-  xbt_lib_foreach(host_lib, cursor, key, ind_host) {
-    WorkstationPtr ws = static_cast<WorkstationPtr>(ind_host[SURF_WKS_LEVEL]);
-    CpuCas01Ptr cpu_cas01 = static_cast<CpuCas01Ptr>(ind_host[SURF_CPU_LEVEL]);
-
-    if (!ws)
-      continue;
-    /* skip if it is not a virtual machine */
-    if (ws->getModel() != static_cast<ModelPtr>(surf_vm_workstation_model))
-      continue;
-    xbt_assert(cpu_cas01, "cpu-less workstation");
+  /* iterate for all virtual machines */
+  for (WorkstationVMModel::vm_list_t::iterator iter =
+         WorkstationVMModel::ws_vms.begin();
+       iter !=  WorkstationVMModel::ws_vms.end(); ++iter) {
 
-    /* It is a virtual machine, so we can cast it to workstation_VM2013_t */
-    WorkstationVMPtr ws_vm = static_cast<WorkstationVMPtr>(ws);
+    WorkstationVMPtr ws_vm = &*iter;
+    CpuCas01Ptr cpu_cas01 = static_cast<CpuCas01Ptr>(ws_vm->p_cpu);
+    xbt_assert(cpu_cas01, "cpu-less workstation");
 
     int is_active = lmm_constraint_used(cpu_cas01->getModel()->getMaxminSystem(), cpu_cas01->getConstraint());
     // int is_active_old = constraint_is_active(cpu_cas01);
@@ -79,17 +82,37 @@ void WorkstationModel::adjustWeightOfDummyCpuActions()
 /************
  * Resource *
  ************/
+Workstation::Workstation()
+{
+  surf_callback_emit(workstationCreatedCallbacks, this);
+}
+
 Workstation::Workstation(ModelPtr model, const char *name, xbt_dict_t props,
 		                 xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu)
  : Resource(model, name, props)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
-{}
+{
+  p_params.ramsize = 0;
+  surf_callback_emit(workstationCreatedCallbacks, this);
+}
 
 Workstation::Workstation(ModelPtr model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
 				         xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu)
  : Resource(model, name, props, constraint)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
-{}
+{
+  p_params.ramsize = 0;
+  surf_callback_emit(workstationCreatedCallbacks, this);
+}
+
+Workstation::~Workstation(){
+  surf_callback_emit(workstationDestructedCallbacks, this);
+}
+
+void Workstation::setState(e_surf_resource_state_t state){
+  Resource::setState(state);
+  surf_callback_emit(workstationStateChangedCallbacks, this);
+}
 
 int Workstation::getCore(){
   return p_cpu->getCore();
@@ -123,17 +146,11 @@ void Workstation::setPowerPeakAt(int pstate_index)
 	p_cpu->setPowerPeakAt(pstate_index);
 }
 
-double Workstation::getConsumedEnergy()
-{
-  return p_cpu->getConsumedEnergy();
-}
-
 xbt_dict_t Workstation::getProperties()
 {
   return p_cpu->getProperties();
 }
 
-
 StoragePtr Workstation::findStorageOnMountList(const char* mount)
 {
   StoragePtr st = NULL;
@@ -282,20 +299,12 @@ xbt_dynar_t Workstation::getVms()
 {
   xbt_dynar_t dyn = xbt_dynar_new(sizeof(smx_host_t), NULL);
 
-  /* iterate for all hosts including virtual machines */
-  xbt_lib_cursor_t cursor;
-  char *key;
-  void **ind_host;
-  xbt_lib_foreach(host_lib, cursor, key, ind_host) {
-    WorkstationPtr ws = static_cast<WorkstationPtr>(ind_host[SURF_WKS_LEVEL]);
-    if (!ws)
-      continue;
-    /* skip if it is not a virtual machine */
-    if (ws->getModel() != static_cast<ModelPtr>(surf_vm_workstation_model))
-      continue;
-
-    /* It is a virtual machine, so we can cast it to workstation_VM2013_t */
-    WorkstationVMPtr ws_vm = static_cast<WorkstationVMPtr>(ws);
+  /* iterate for all virtual machines */
+  for (WorkstationVMModel::vm_list_t::iterator iter =
+         WorkstationVMModel::ws_vms.begin();
+       iter !=  WorkstationVMModel::ws_vms.end(); ++iter) {
+
+    WorkstationVMPtr ws_vm = &*iter;
     if (this == ws_vm-> p_subWs)
       xbt_dynar_push(dyn, &ws_vm->p_subWs);
   }
@@ -305,15 +314,20 @@ xbt_dynar_t Workstation::getVms()
 
 void Workstation::getParams(ws_params_t params)
 {
-  memcpy(params, &p_params, sizeof(s_ws_params_t));
+  *params = p_params;
 }
 
 void Workstation::setParams(ws_params_t params)
 {
   /* may check something here. */
-  memcpy(&p_params, params, sizeof(s_ws_params_t));
+  p_params = *params;
 }
 
 /**********
  * Action *
  **********/
+
+void WorkstationAction::setState(e_surf_action_state_t state){
+  Action::setState(state);
+  surf_callback_emit(workstationActionStateChangedCallbacks, this);
+}