A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use simgrid::Host instead of xbt_dictelt_t for root main object
[simgrid.git]
/
src
/
simdag
/
sd_workstation.c
diff --git
a/src/simdag/sd_workstation.c
b/src/simdag/sd_workstation.c
index
e7062c2
..
3b5c2ea
100644
(file)
--- a/
src/simdag/sd_workstation.c
+++ b/
src/simdag/sd_workstation.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
4
. The SimGrid Team.
+/* Copyright (c) 2006-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-25,7
+25,6
@@
SD_workstation_t __SD_workstation_create(void *surf_workstation,
const char *name;
workstation = xbt_new(s_SD_workstation_priv_t, 1);
const char *name;
workstation = xbt_new(s_SD_workstation_priv_t, 1);
- workstation->data = data; /* user data */
workstation->access_mode = SD_WORKSTATION_SHARED_ACCESS; /* default mode is shared */
workstation->task_fifo = NULL;
workstation->current_task = NULL;
workstation->access_mode = SD_WORKSTATION_SHARED_ACCESS; /* default mode is shared */
workstation->task_fifo = NULL;
workstation->current_task = NULL;
@@
-33,6
+32,7
@@
SD_workstation_t __SD_workstation_create(void *surf_workstation,
name = surf_resource_name(surf_workstation);
sg_host_t sg_host = sg_host_by_name(name);
sg_host_sd_set(sg_host,workstation);
name = surf_resource_name(surf_workstation);
sg_host_t sg_host = sg_host_by_name(name);
sg_host_sd_set(sg_host,workstation);
+ sg_host_user_set(sg_host,data);
return sg_host;
}
return sg_host;
}
@@
-72,7
+72,7
@@
void __SD_storage_destroy(void *storage)
*/
SD_workstation_t SD_workstation_get_by_name(const char *name)
{
*/
SD_workstation_t SD_workstation_get_by_name(const char *name)
{
- return
xbt_lib_get_elm_or_null(host_lib,
name);
+ return
sg_host_by_name(
name);
}
/**
}
/**
@@
-101,7
+101,7
@@
const SD_workstation_t *SD_workstation_get_list(void) {
*/
int SD_workstation_get_number(void)
{
*/
int SD_workstation_get_number(void)
{
- return
xbt_lib_length(host_lib
);
+ return
sg_host_count(
);
}
/**
}
/**
@@
-113,7
+113,7
@@
int SD_workstation_get_number(void)
*/
void *SD_workstation_get_data(SD_workstation_t workstation)
{
*/
void *SD_workstation_get_data(SD_workstation_t workstation)
{
- return sg_host_
sd(workstation)->data
;
+ return sg_host_
user(workstation)
;
}
/**
}
/**
@@
-128,7
+128,7
@@
void *SD_workstation_get_data(SD_workstation_t workstation)
*/
void SD_workstation_set_data(SD_workstation_t workstation, void *data)
{
*/
void SD_workstation_set_data(SD_workstation_t workstation, void *data)
{
- sg_host_
sd(workstation)->data = data
;
+ sg_host_
user_set(workstation, data)
;
}
/**
}
/**
@@
-139,7
+139,7
@@
void SD_workstation_set_data(SD_workstation_t workstation, void *data)
*/
const char *SD_workstation_get_name(SD_workstation_t workstation)
{
*/
const char *SD_workstation_get_name(SD_workstation_t workstation)
{
- return sg_host_name(workstation);
+ return sg_host_
get_
name(workstation);
}
/**
}
/**