X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc9db1be8c886672e63a1589a5a2b8e9a9561818..e427576952c74965f2864ca87332f90dc1fc5924:/src/msg/msg_legacy.cpp

diff --git a/src/msg/msg_legacy.cpp b/src/msg/msg_legacy.cpp
index 26693aa738..ec0eee02f3 100644
--- a/src/msg/msg_legacy.cpp
+++ b/src/msg/msg_legacy.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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. */
@@ -55,7 +55,9 @@ int MSG_task_listen(const char* alias)
 /* ************************** Actors *************************** */
 void MSG_process_on_exit(int_f_int_pvoid_t fun, void* data)
 {
-  sg_actor_on_exit(fun, data);
+  /* We can't use the sg_actor_on_exit, as the return type of the callback changed: the int in MSG is ignored and was
+   * removed in sg */
+  simgrid::s4u::this_actor::on_exit([fun, data](bool failed) { fun(failed ? 1 /*FAILURE*/ : 0 /*SUCCESS*/, data); });
 }
 
 int MSG_process_get_PID(const_sg_actor_t actor)
@@ -94,7 +96,7 @@ void MSG_process_resume(sg_actor_t actor)
 {
   sg_actor_resume(actor);
 }
-int MSG_process_is_suspended(sg_actor_t actor)
+int MSG_process_is_suspended(const_sg_actor_t actor)
 {
   return sg_actor_is_suspended(actor);
 }
@@ -115,7 +117,7 @@ void MSG_process_migrate(sg_actor_t actor, sg_host_t host)
 {
   sg_actor_set_host(actor, host);
 }
-void MSG_process_join(sg_actor_t actor, double timeout)
+void MSG_process_join(const_sg_actor_t actor, double timeout)
 {
   sg_actor_join(actor, timeout);
 }
@@ -155,7 +157,7 @@ void* MSG_process_get_data(const_sg_actor_t process)
   xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
 
   /* get from SIMIX the MSG process data, and then the user data */
-  return sg_actor_data(process);
+  return sg_actor_get_data(process);
 }
 
 /** @brief Sets the user data of a process.
@@ -165,7 +167,7 @@ void* MSG_process_get_data(const_sg_actor_t process)
 msg_error_t MSG_process_set_data(msg_process_t process, void* data)
 {
   xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
-  sg_actor_data_set(process, data);
+  sg_actor_set_data(process, data);
 
   return MSG_OK;
 }
@@ -218,9 +220,9 @@ void MSG_process_unref(const_sg_actor_t process)
   sg_actor_unref(process);
 }
 /** @brief Return the current number MSG processes. */
-int MSG_process_get_number()
+int MSG_process_get_number() // XBT_ATTRIB_DEPRECATED_v330
 {
-  return simgrid_get_actor_count();
+  return sg_actor_count();
 }
 /* ************************** NetZones *************************** */
 sg_netzone_t MSG_zone_get_root()
@@ -252,52 +254,6 @@ void MSG_zone_get_hosts(const_sg_netzone_t zone, xbt_dynar_t whereto)
   sg_zone_get_hosts(zone, whereto);
 }
 
-/* ************************** Storages *************************** */
-const char* MSG_storage_get_name(const_sg_storage_t storage)
-{
-  return sg_storage_get_name(storage);
-}
-sg_storage_t MSG_storage_get_by_name(const char* name)
-{
-  return sg_storage_get_by_name(name);
-}
-xbt_dict_t MSG_storage_get_properties(const_sg_storage_t storage)
-{
-  return sg_storage_get_properties(storage);
-}
-void MSG_storage_set_property_value(sg_storage_t storage, const char* name, const char* value)
-{
-  sg_storage_set_property_value(storage, name, value);
-}
-const char* MSG_storage_get_property_value(const_sg_storage_t storage, const char* name)
-{
-  return sg_storage_get_property_value(storage, name);
-}
-xbt_dynar_t MSG_storages_as_dynar()
-{
-  return sg_storages_as_dynar();
-}
-void MSG_storage_set_data(sg_storage_t storage, void* data)
-{
-  sg_storage_set_data(storage, data);
-}
-void* MSG_storage_get_data(const_sg_storage_t storage)
-{
-  return sg_storage_get_data(storage);
-}
-const char* MSG_storage_get_host(const_sg_storage_t storage)
-{
-  return sg_storage_get_host(storage);
-}
-sg_size_t MSG_storage_read(sg_storage_t storage, sg_size_t size)
-{
-  return sg_storage_read(storage, size);
-}
-sg_size_t MSG_storage_write(sg_storage_t storage, sg_size_t size)
-{
-  return sg_storage_write(storage, size);
-}
-
 /* ************************** hosts *************************** */
 xbt_dynar_t MSG_hosts_as_dynar() // XBT_ATTRIB_DEPRECATED_v330
 {
@@ -329,11 +285,11 @@ const char* MSG_host_get_name(const_sg_host_t host)
 }
 void* MSG_host_get_data(const_sg_host_t host)
 {
-  return sg_host_data(host);
+  return sg_host_get_data(host);
 }
 void MSG_host_set_data(sg_host_t host, void* data)
 {
-  return sg_host_data_set(host, data);
+  return sg_host_set_data(host, data);
 }
 xbt_dict_t MSG_host_get_mounted_storage_list(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
 {
@@ -345,7 +301,7 @@ xbt_dynar_t MSG_host_get_attached_storage_lists(const_sg_host_t host)
 }
 double MSG_host_get_speed(const_sg_host_t host)
 {
-  return sg_host_speed(host);
+  return sg_host_get_speed(host);
 }
 double MSG_host_get_power_peak_at(const_sg_host_t host, int pstate_index)
 {
@@ -402,7 +358,7 @@ sg_host_t MSG_host_self()
 
 double MSG_host_get_load(const_sg_host_t host)
 {
-  return sg_host_load(host);
+  return sg_host_get_load(host);
 }
 /* ************************** Virtual Machines *************************** */
 sg_vm_t MSG_vm_create_core(sg_host_t pm, const char* name)
@@ -413,15 +369,15 @@ sg_vm_t MSG_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount)
 {
   return sg_vm_create_multicore(pm, name, coreAmount);
 }
-int MSG_vm_is_created(sg_vm_t vm)
+int MSG_vm_is_created(const_sg_vm_t vm)
 {
   return sg_vm_is_created(vm);
 }
-int MSG_vm_is_running(sg_vm_t vm)
+int MSG_vm_is_running(const_sg_vm_t vm)
 {
   return sg_vm_is_running(vm);
 }
-int MSG_vm_is_suspended(sg_vm_t vm)
+int MSG_vm_is_suspended(const_sg_vm_t vm)
 {
   return sg_vm_is_suspended(vm);
 }
@@ -497,7 +453,7 @@ void MSG_sem_release(sg_sem_t sem)
 {
   sg_sem_release(sem);
 }
-int MSG_sem_get_capacity(sg_sem_t sem)
+int MSG_sem_get_capacity(const_sg_sem_t sem)
 {
   return sg_sem_get_capacity(sem);
 }
@@ -505,7 +461,7 @@ void MSG_sem_destroy(const_sg_sem_t sem)
 {
   sg_sem_destroy(sem);
 }
-int MSG_sem_would_block(sg_sem_t sem)
+int MSG_sem_would_block(const_sg_sem_t sem)
 {
   return sg_sem_would_block(sem);
 }