Use MSG_host_by_name() instead of MSG_get_host_by_name()

Both work, but the first is more coherent with the rest of the
interface.

diff --git a/examples/msg/cloud/migrate_vm.c b/examples/msg/cloud/migrate_vm.c
index 03a08be..13cce2f 100644 (file)
--- a/examples/msg/cloud/migrate_vm.c
+++ b/examples/msg/cloud/migrate_vm.c
@@ -33,8 +33,8 @@ static int migration_worker_main(int argc, char *argv[])
   char *vm_name = argv[1];
   char *dst_pm_name = argv[2];
 
-  msg_vm_t vm = MSG_get_host_by_name(vm_name);
-  msg_host_t dst_pm = MSG_get_host_by_name(dst_pm_name);
+  msg_vm_t vm = MSG_host_by_name(vm_name);
+  msg_host_t dst_pm = MSG_host_by_name(dst_pm_name);
 
   vm_migrate(vm, dst_pm);
 

diff --git a/examples/msg/energy/consumption/energy_consumption.c b/examples/msg/energy/consumption/energy_consumption.c
index 2b70166..45027a8 100644 (file)
--- a/examples/msg/energy/consumption/energy_consumption.c
+++ b/examples/msg/energy/consumption/energy_consumption.c
@@ -24,7 +24,7 @@ int dvfs(int argc, char *argv[])
 {
   msg_host_t host = NULL;
   msg_task_t task1 = NULL;
-  host = MSG_get_host_by_name("MyHost1");
+  host = MSG_host_by_name("MyHost1");
 
 
   XBT_INFO("Energetic profile: %s",
@@ -78,8 +78,8 @@ int dvfs(int argc, char *argv[])
 
   // =========== Turn the other host off ==========
   XBT_INFO("Turning MyHost2 off, and sleeping another 10 seconds. MyHost2 dissipated %.0f J so far.",
-                 MSG_host_get_consumed_energy(MSG_get_host_by_name("MyHost2")) );
-  MSG_host_off(MSG_get_host_by_name("MyHost2"));
+                 MSG_host_get_consumed_energy(MSG_host_by_name("MyHost2")) );
+  MSG_host_off(MSG_host_by_name("MyHost2"));
   start = MSG_get_clock();
   MSG_process_sleep(10);
   XBT_INFO("Done sleeping (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",

diff --git a/examples/msg/energy/onoff/onoff.c b/examples/msg/energy/onoff/onoff.c
index 2a03378..40a0979 100644 (file)
--- a/examples/msg/energy/onoff/onoff.c
+++ b/examples/msg/energy/onoff/onoff.c
@@ -65,7 +65,7 @@ static void simulate_shutdown(msg_host_t host) {
 }
 
 static int onoff(int argc, char *argv[]) {
-       msg_host_t host1 = MSG_get_host_by_name("MyHost1");
+       msg_host_t host1 = MSG_host_by_name("MyHost1");
 
        XBT_INFO("Energetic profile: %s",
                        MSG_host_get_property_value(host1,"watt_per_state"));

diff --git a/examples/msg/energy/pstate/pstate.c b/examples/msg/energy/pstate/pstate.c
index 143251f..4716a87 100644 (file)
--- a/examples/msg/energy/pstate/pstate.c
+++ b/examples/msg/energy/pstate/pstate.c
@@ -77,7 +77,7 @@ int dvfs(int argc, char *argv[])
 
 
   // Verify the default pstate is set to 0
-  host = MSG_get_host_by_name("MyHost2");
+  host = MSG_host_by_name("MyHost2");
   int nb2 = MSG_host_get_nb_pstates(host);
   XBT_INFO("Count of Processor states=%d", nb2);
 

diff --git a/examples/msg/io/remote.c b/examples/msg/io/remote.c
index 620ab81..fd7ebe8 100644 (file)
--- a/examples/msg/io/remote.c
+++ b/examples/msg/io/remote.c
@@ -54,7 +54,7 @@ int host(int argc, char *argv[]){
 
     msg_host_t src, dest;
     src= MSG_host_self();
-    dest = MSG_get_host_by_name(argv[3]);
+    dest = MSG_host_by_name(argv[3]);
     if (atoi(argv[5])){
       XBT_INFO("Move '%s' (of size %llu) from '%s' to '%s'", filename,
            MSG_file_get_size(file), MSG_host_get_name(src),

diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c
index 6ba7bc5..1648f9f 100644 (file)
--- a/examples/msg/masterslave/masterslave_bypass.c
+++ b/examples/msg/masterslave/masterslave_bypass.c
@@ -192,7 +192,7 @@ int master(int argc, char *argv[])
     slaves = xbt_new0(msg_host_t, slaves_count);
 
     for (i = 4; i < argc; i++) {
-      slaves[i - 4] = MSG_get_host_by_name(argv[i]);
+      slaves[i - 4] = MSG_host_by_name(argv[i]);
       if (slaves[i - 4] == NULL) {
         XBT_INFO("Unknown host %s. Stopping Now!", argv[i]);
         abort();

diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c
index dbb760c..4a7864b 100644 (file)
--- a/examples/msg/masterslave/masterslave_cluster.c
+++ b/examples/msg/masterslave/masterslave_cluster.c
@@ -59,7 +59,7 @@ int master(int argc, char *argv[])
     slaves = xbt_new0(msg_host_t, slaves_count);
 
     for (i = 4; i < argc; i++) {
-      slaves[i - 4] = MSG_get_host_by_name(argv[i]);
+      slaves[i - 4] = MSG_host_by_name(argv[i]);
       if (slaves[i - 4] == NULL) {
         XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();

diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index cc8398a..6207395 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -44,7 +44,7 @@ int master(int argc, char *argv[])
     slaves = xbt_new0(msg_host_t, slaves_count);
 
     for (i = 4; i < argc; i++) {
-      slaves[i - 4] = MSG_get_host_by_name(argv[i]);
+      slaves[i - 4] = MSG_host_by_name(argv[i]);
       if (slaves[i - 4] == NULL) {
         XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();

diff --git a/examples/msg/masterslave/masterslave_failure_platfgen.c b/examples/msg/masterslave/masterslave_failure_platfgen.c
index 3f030c1..65420d8 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure_platfgen.c
+++ b/examples/msg/masterslave/masterslave_failure_platfgen.c
@@ -125,7 +125,7 @@ int master(int argc, char *argv[])
     slaves = xbt_new0(msg_host_t, slaves_count);
 
     for (i = 0; i < argc; i++) {
-      slaves[i] = MSG_get_host_by_name(argv[i]);
+      slaves[i] = MSG_host_by_name(argv[i]);
       if (slaves[i] == NULL) {
         XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();
@@ -320,7 +320,7 @@ int main(int argc, char *argv[])
     MSG_process_auto_restart_set(process, TRUE);
     hostname_list[i] = (char*) MSG_host_get_name(host);
   }
-  host_master = MSG_get_host_by_name("host_master");
+  host_master = MSG_host_by_name("host_master");
   MSG_process_create_with_arguments("master", master, NULL, host_master,
                                     xbt_dynar_length(host_dynar),
                                     hostname_list);

diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c
index cf66fae..96cb6f8 100644 (file)
--- a/examples/msg/masterslave/masterslave_forwarder.c
+++ b/examples/msg/masterslave/masterslave_forwarder.c
@@ -68,7 +68,7 @@ int master(int argc, char *argv[])
     slaves = xbt_new0(msg_host_t, slaves_count);
 
     for (i = 4; i < argc; i++) {
-      slaves[i - 4] = MSG_get_host_by_name(argv[i]);
+      slaves[i - 4] = MSG_host_by_name(argv[i]);
       xbt_assert(slaves[i - 4] != NULL, "Unknown host %s. Stopping Now! ",
                   argv[i]);
     }
@@ -140,7 +140,7 @@ int forwarder(int argc, char *argv[])
     slaves = xbt_new0(msg_host_t, slaves_count);
 
     for (i = 1; i < argc; i++) {
-      slaves[i - 1] = MSG_get_host_by_name(argv[i]);
+      slaves[i - 1] = MSG_host_by_name(argv[i]);
       if (slaves[i - 1] == NULL) {
         XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();

diff --git a/examples/msg/masterslave/masterslave_kill.c b/examples/msg/masterslave/masterslave_kill.c
index 9c8e09e..438a485 100644 (file)
--- a/examples/msg/masterslave/masterslave_kill.c
+++ b/examples/msg/masterslave/masterslave_kill.c
@@ -29,7 +29,7 @@ static int master(int argc, char *argv[])
   msg_process_t bob = NULL;
 
   XBT_INFO("Hello!");
-  bob = MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Fafard"));
+  bob = MSG_process_create("slave", slave, NULL, MSG_host_by_name("Fafard"));
   MSG_process_sleep(10.0);
 
   XBT_INFO("Resume process");

diff --git a/examples/msg/masterslave/masterslave_platfgen.c b/examples/msg/masterslave/masterslave_platfgen.c
index 134fae7..ef94493 100644 (file)
--- a/examples/msg/masterslave/masterslave_platfgen.c
+++ b/examples/msg/masterslave/masterslave_platfgen.c
@@ -79,7 +79,7 @@ int master(int argc, char *argv[])
     slaves = xbt_new0(msg_host_t, slaves_count);
 
     for (i = 0; i < argc; i++) {
-      slaves[i] = MSG_get_host_by_name(argv[i]);
+      slaves[i] = MSG_host_by_name(argv[i]);
       if (slaves[i] == NULL) {
         XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();

diff --git a/examples/msg/migration/migration.c b/examples/msg/migration/migration.c
index ef06bf1..35fc18a 100644 (file)
--- a/examples/msg/migration/migration.c
+++ b/examples/msg/migration/migration.c
@@ -30,7 +30,7 @@ static int emigrant(int argc, char *argv[])
   msg_task_t task;
   XBT_INFO
       ("I'll look for a new job on another machine where the grass is greener.");
-  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Boivin"));
+  MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Boivin"));
   
   XBT_INFO("Yeah, found something to do");
   task = MSG_task_create("job", 98095000, 0, NULL);
@@ -38,8 +38,8 @@ static int emigrant(int argc, char *argv[])
   MSG_task_destroy(task);
   MSG_process_sleep(2);
   XBT_INFO("Moving back home after work");
-  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Jacquelin"));
-  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Boivin"));
+  MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Jacquelin"));
+  MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Boivin"));
   MSG_process_sleep(4);
   xbt_mutex_acquire(mutex);
   process_to_migrate = MSG_process_self();
@@ -60,7 +60,7 @@ static int policeman(int argc, char *argv[])
   xbt_mutex_acquire(mutex);
   XBT_INFO("Wait a bit before migrating the emigrant.");
   while (process_to_migrate == NULL) xbt_cond_wait(cond, mutex);
-  MSG_process_migrate(process_to_migrate, MSG_get_host_by_name("Jacquelin"));
+  MSG_process_migrate(process_to_migrate, MSG_host_by_name("Jacquelin"));
   XBT_INFO("I moved the emigrant");
   MSG_process_resume(process_to_migrate);
   xbt_mutex_release(mutex);

diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c
index dc0e965..93a6596 100644 (file)
--- a/examples/msg/parallel_task/test_ptask.c
+++ b/examples/msg/parallel_task/test_ptask.c
@@ -38,7 +38,7 @@ int execute(int argc, char *argv[])
   XBT_DEBUG("host_list_size=%d", host_list_size);
   m_host_list = calloc(host_list_size, sizeof(msg_host_t));
   for (i = 1; i <= host_list_size; i++) {
-    m_host_list[i - 1] = MSG_get_host_by_name(argv[i]);
+    m_host_list[i - 1] = MSG_host_by_name(argv[i]);
     xbt_assert(m_host_list[i - 1] != NULL,
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
@@ -94,7 +94,7 @@ int redistribute(int argc, char *argv[])
   XBT_DEBUG("host_list_size=%d", host_list_size);
   m_host_list = calloc(host_list_size, sizeof(msg_host_t));
   for (i = 1; i <= host_list_size; i++) {
-    m_host_list[i - 1] = MSG_get_host_by_name(argv[i]);
+    m_host_list[i - 1] = MSG_host_by_name(argv[i]);
     xbt_assert(m_host_list[i - 1] != NULL,
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }

diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index d460550..74af332 100644 (file)
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -37,7 +37,7 @@ msg_error_t test_all(const char *platform_file,
 
 static void test_host(const char*hostname) 
 {
-  msg_host_t thehost = MSG_get_host_by_name(hostname);
+  msg_host_t thehost = MSG_host_by_name(hostname);
   xbt_dict_t props = MSG_host_get_properties(thehost);
   xbt_dict_cursor_t cursor = NULL;
   char *key, *data;

diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index 1046db4..6e5c1cc 100644 (file)
--- a/examples/msg/sendrecv/sendrecv.c
+++ b/examples/msg/sendrecv/sendrecv.c
@@ -48,7 +48,7 @@ int sender(int argc, char *argv[])
 
   XBT_INFO("host = %s", argv[1]);
 
-  host = MSG_get_host_by_name(argv[1]);
+  host = MSG_host_by_name(argv[1]);
 
   if (host == NULL) {
     XBT_INFO("Unknown host %s. Stopping Now! ", argv[1]);

diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index 94562ac..021a664 100644 (file)
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -37,7 +37,7 @@ static int emigrant(int argc, char *argv[])
     destination = (char*)MSG_task_get_data (task);
     MSG_task_destroy (task);
     if (!destination) break; //there is no destination, die
-    MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name(destination));
+    MSG_process_migrate(MSG_process_self(), MSG_host_by_name(destination));
     MSG_process_sleep(2); // I am tired, have to sleep for 2 seconds
     free (destination);
     task = NULL;

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index a2c656d..72baeeb 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -295,8 +295,8 @@ XBT_PUBLIC(xbt_dict_t) MSG_as_router_get_properties(const char* asr);
 XBT_PUBLIC(void) MSG_as_router_set_property_value(const char* asr, const char *name, char *value,void_f_pvoid_t free_ctn);
 
 /************************** Host handling ***********************************/
-XBT_PUBLIC(msg_host_t) MSG_host_get_by_name(const char *name);
-#define MSG_get_host_by_name(n) MSG_host_get_by_name(n) /* Rewrite the old name into the new one transparently */
+XBT_PUBLIC(msg_host_t) MSG_host_by_name(const char *name);
+#define MSG_get_host_by_name(n) MSG_host_by_name(n) /* Rewrite the old name into the new one transparently */
 XBT_PUBLIC(msg_error_t) MSG_host_set_data(msg_host_t host, void *data);
 XBT_PUBLIC(void *) MSG_host_get_data(msg_host_t host);
 XBT_PUBLIC(const char *) MSG_host_get_name(msg_host_t host);

diff --git a/src/bindings/java/jmsg_host.c b/src/bindings/java/jmsg_host.c
index d0ac0be..5549651 100644 (file)
--- a/src/bindings/java/jmsg_host.c
+++ b/src/bindings/java/jmsg_host.c
@@ -77,7 +77,7 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
   }
   const char *name = (*env)->GetStringUTFChars(env, jname, 0);
   /* get the host by name       (the hosts are created during the grid resolution) */
-  host = MSG_get_host_by_name(name);
+  host = MSG_host_by_name(name);
 
   if (!host) {                  /* invalid name */
     jxbt_throw_host_not_found(env, name);

diff --git a/src/bindings/java/jmsg_process.c b/src/bindings/java/jmsg_process.c
index a65f183..0f8a905 100644 (file)
--- a/src/bindings/java/jmsg_process.c
+++ b/src/bindings/java/jmsg_process.c
@@ -131,7 +131,7 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env,
   }
 
   /* bind/retrieve the msg host */
-  host = MSG_get_host_by_name(hostname);
+  host = MSG_host_by_name(hostname);
 
   if (!(host)) {    /* not bound */
     jxbt_throw_host_not_found(env, hostname);

diff --git a/src/bindings/lua/lua_host.c b/src/bindings/lua/lua_host.c
index 04c6eb6..4d65ac6 100644 (file)
--- a/src/bindings/lua/lua_host.c
+++ b/src/bindings/lua/lua_host.c
@@ -50,7 +50,7 @@ static int l_host_get_by_name(lua_State * L)
 {
   const char *name = luaL_checkstring(L, 1);
   XBT_DEBUG("Getting Host from name...");
-  msg_host_t msg_host = MSG_get_host_by_name(name);
+  msg_host_t msg_host = MSG_host_by_name(name);
   if (!msg_host) {
     luaL_error(L, "null Host : MSG_get_host_by_name failed");
   }

diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c
index 1a73c97..56f429f 100644 (file)
--- a/src/bindings/lua/lua_platf.c
+++ b/src/bindings/lua/lua_platf.c
@@ -369,8 +369,7 @@ int console_set_function(lua_State *L) {
   args = xbt_str_split_str( lua_tostring(L,-1) , ",");
   lua_pop(L, 1);
 
-  // FIXME: hackish to go under MSG that way
-  msg_host_t host = MSG_host_get_by_name(host_id);
+  msg_host_t host = MSG_host_by_name(host_id);
   if (!host) {
     XBT_ERROR("no host '%s' found",host_id);
     return -1;
@@ -409,7 +408,7 @@ int console_host_set_property(lua_State *L) {
   prop_value = lua_tostring(L,-1);
   lua_pop(L, 1);
 
-  msg_host_t host = MSG_host_get_by_name(name);
+  msg_host_t host = MSG_host_by_name(name);
   if (!host) {
     XBT_ERROR("no host '%s' found",name);
     return -1;

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index a708a94..ceaa015 100644 (file)
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -66,7 +66,7 @@ msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our paramete
  * \param name the name of an host.
  * \return the corresponding host
  */
-msg_host_t MSG_host_get_by_name(const char *name)
+msg_host_t MSG_host_by_name(const char *name)
 {
   return (msg_host_t) xbt_lib_get_elm_or_null(host_lib,name);
 }

diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c
index efee6ce..583673f 100644 (file)
--- a/src/msg/msg_io.c
+++ b/src/msg/msg_io.c
@@ -100,7 +100,7 @@ sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size)
   /* Find the host where the file is physically located and read it */
   msg_storage_t storage_src =(msg_storage_t) xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId);
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
-  msg_host_t attached_host = MSG_get_host_by_name(storage_priv_src->hostname);
+  msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
   read_size = simcall_file_read(file_priv->simdata->smx_file, size, attached_host);
 
   if(strcmp(storage_priv_src->hostname, MSG_host_get_name(MSG_host_self()))){
@@ -145,7 +145,7 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
   /* Find the host where the file is physically located (remote or local)*/
   msg_storage_t storage_src =(msg_storage_t) xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId);
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
-  msg_host_t attached_host = MSG_get_host_by_name(storage_priv_src->hostname);
+  msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
 
   if(strcmp(storage_priv_src->hostname, MSG_host_get_name(MSG_host_self()))){
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
@@ -237,7 +237,7 @@ msg_error_t MSG_file_unlink(msg_file_t fd)
       (msg_storage_t) xbt_lib_get_elm_or_null(storage_lib,
                                               file_priv->storageId);
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
-  msg_host_t attached_host = MSG_get_host_by_name(storage_priv_src->hostname);
+  msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
   int res = simcall_file_unlink(file_priv->simdata->smx_file, attached_host);
   return res;
 }
@@ -323,7 +323,7 @@ msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa
   /* Find the host where the file is physically located and read it */
   msg_storage_t storage_src =(msg_storage_t) xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId);
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
-  msg_host_t attached_host = MSG_get_host_by_name(storage_priv_src->hostname);
+  msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
   MSG_file_seek(file, 0, SEEK_SET);
   read_size = simcall_file_read(file_priv->simdata->smx_file, file_priv->size, attached_host);
 
@@ -353,7 +353,7 @@ msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa
     /* Mount point found, retrieve the host the storage is attached to */
     msg_storage_priv_t storage_dest_priv = MSG_storage_priv(storage_dest);
     host_name_dest = (char*)storage_dest_priv->hostname;
-    host_dest = MSG_get_host_by_name(host_name_dest);
+    host_dest = MSG_host_by_name(host_name_dest);
 
   }else{
     XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, SIMIX_host_get_name(host));

diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index 44d3838..cf3266e 100644 (file)
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -60,7 +60,7 @@ void MSG_process_create_from_SIMIX(smx_process_t* process, const char *name,
                                    xbt_dict_t properties, int auto_restart,
                                    smx_process_t parent_process)
 {
-  msg_host_t host = MSG_get_host_by_name(hostname);
+  msg_host_t host = MSG_host_by_name(hostname);
   msg_process_t p = MSG_process_create_with_environment(name, code, data,
                                                       host, argc, argv,
                                                       properties);

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index 1c2efed..e68d1dd 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -76,7 +76,7 @@ void MSG_vm_set_property_value(msg_vm_t vm, const char *name, void *value, void_
 
 msg_vm_t MSG_vm_get_by_name(const char *name)
 {
-  return MSG_get_host_by_name(name);
+  return MSG_host_by_name(name);
 }
 
 /** \ingroup m_vm_management

diff --git a/teshsuite/msg/host_on_off/host_on_off.c b/teshsuite/msg/host_on_off/host_on_off.c
index 62660f9..f3e0759 100644 (file)
--- a/teshsuite/msg/host_on_off/host_on_off.c
+++ b/teshsuite/msg/host_on_off/host_on_off.c
@@ -25,7 +25,7 @@ int master(int argc, char *argv[])
 
   char mailbox[256];
   msg_task_t task = NULL;
-  msg_host_t jupiter = MSG_get_host_by_name("Jupiter");
+  msg_host_t jupiter = MSG_host_by_name("Jupiter");
   sprintf(mailbox, "jupi");
 
   task = MSG_task_create("task on", task_comp_size, task_comm_size, NULL);
@@ -55,7 +55,7 @@ int master(int argc, char *argv[])
 
   char **argvF = xbt_new(char*, 2);
   argvF[0] = xbt_strdup("slave");
-  MSG_process_create_with_arguments("slave", slave, NULL, MSG_get_host_by_name("Jupiter"), 1, argvF);
+  MSG_process_create_with_arguments("slave", slave, NULL, MSG_host_by_name("Jupiter"), 1, argvF);
 
   task = MSG_task_create("task on with proc", task_comp_size, task_comm_size, NULL);
   XBT_INFO("Sending \"%s\"", task->name);

diff --git a/teshsuite/msg/host_on_off/host_on_off_recv.c b/teshsuite/msg/host_on_off/host_on_off_recv.c
index 9fb3bde..2ef12c3 100644 (file)
--- a/teshsuite/msg/host_on_off/host_on_off_recv.c
+++ b/teshsuite/msg/host_on_off/host_on_off_recv.c
@@ -25,7 +25,7 @@ int master(int argc, char *argv[])
 {
   xbt_ex_t e;
   TRY {
-    msg_host_t jupiter = MSG_get_host_by_name("Jupiter");
+    msg_host_t jupiter = MSG_host_by_name("Jupiter");
     
     XBT_INFO("Master starting");
     MSG_process_sleep(0.5);

diff --git a/teshsuite/msg/host_on_off/host_on_off_wait.c b/teshsuite/msg/host_on_off/host_on_off_wait.c
index 8237bf2..5decb22 100644 (file)
--- a/teshsuite/msg/host_on_off/host_on_off_wait.c
+++ b/teshsuite/msg/host_on_off/host_on_off_wait.c
@@ -23,7 +23,7 @@ int master(int argc, char *argv[])
 {
   xbt_ex_t e;
   TRY {
-    msg_host_t jupiter = MSG_get_host_by_name("Jupiter");
+    msg_host_t jupiter = MSG_host_by_name("Jupiter");
     XBT_INFO("Master waiting");
     if(MSG_process_sleep(1)) {
       XBT_ERROR("Unexpected error while sleeping");

diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
index d81dfe8..2db60b3 100644 (file)
--- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
@@ -28,7 +28,7 @@ int test_launcher(int argc, char *argv[])
   char **argvF;
   argvF = xbt_new(char*, 2);
   argvF[0] = xbt_strdup("process_daemon");
-  msg_host_t jupiter = MSG_get_host_by_name("Jupiter");
+  msg_host_t jupiter = MSG_host_by_name("Jupiter");
 
   test = 1;
   // Create a process running a simple task on a host and turn the host off during the execution of the process.
@@ -90,7 +90,7 @@ int test_launcher(int argc, char *argv[])
     MSG_process_sleep(10);
     argvF = xbt_new(char*, 2);
     argvF[0] = xbt_strdup("commRX");
-    MSG_process_create_with_arguments("commRX", commRX, NULL, MSG_get_host_by_name("Tremblay"), 1, argvF);
+    MSG_process_create_with_arguments("commRX", commRX, NULL, MSG_host_by_name("Tremblay"), 1, argvF);
     argvF = xbt_new(char*, 2);
     argvF[0] = xbt_strdup("commTX");
     MSG_process_create_with_arguments("commTX", commTX, NULL, jupiter, 1, argvF);
@@ -111,7 +111,7 @@ int test_launcher(int argc, char *argv[])
     MSG_process_create_with_arguments("commRX", commRX, NULL, jupiter, 1, argvF);
     argvF = xbt_new(char*, 2);
     argvF[0] = xbt_strdup("commTX");
-    MSG_process_create_with_arguments("commTX", commTX, NULL, MSG_get_host_by_name("Tremblay"), 1, argvF);
+    MSG_process_create_with_arguments("commTX", commTX, NULL, MSG_host_by_name("Tremblay"), 1, argvF);
     XBT_INFO("  number of processes: %d", MSG_process_get_number());
     MSG_process_sleep(10);
     XBT_INFO("  Turn Jupiter off");

diff --git a/teshsuite/msg/storage/concurrent_rw.c b/teshsuite/msg/storage/concurrent_rw.c
index 592715a..32b0d7d 100644 (file)
--- a/teshsuite/msg/storage/concurrent_rw.c
+++ b/teshsuite/msg/storage/concurrent_rw.c
@@ -116,16 +116,16 @@ int main(int argc, char **argv)
   MSG_create_environment(argv[1]);
 
   MSG_function_register("host", host);
-  storage_info(MSG_get_host_by_name(xbt_strdup("host")));
+  storage_info(MSG_host_by_name(xbt_strdup("host")));
   for(i = 0 ; i<10; i++){
-       MSG_process_create(xbt_strdup("host"), host, NULL, MSG_get_host_by_name(xbt_strdup("host")));
+       MSG_process_create(xbt_strdup("host"), host, NULL, MSG_host_by_name(xbt_strdup("host")));
   }
 
 
 
 
   res = MSG_main();
-  storage_info(MSG_get_host_by_name(xbt_strdup("host")));
+  storage_info(MSG_host_by_name(xbt_strdup("host")));
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
   if (res == MSG_OK)