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
fullduplex support
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index
2370388
..
3d080f2
100644
(file)
--- a/
src/simix/smx_process.c
+++ b/
src/simix/smx_process.c
@@
-1,6
+1,5
@@
-//* $Id$ */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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. */
/* 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. */
@@
-165,7
+164,7
@@
void SIMIX_process_kill(smx_process_t process)
}
if (process->sem) {
}
if (process->sem) {
- xbt_
swag_remove(process, process->sem->sleeping
);
+ xbt_
fifo_remove(process->sem->sleeping, process
);
if (process->waiting_action) {
SIMIX_unregister_action_to_semaphore(process->waiting_action, process->sem);
if (process->waiting_action) {
SIMIX_unregister_action_to_semaphore(process->waiting_action, process->sem);
@@
-197,7
+196,7
@@
void SIMIX_process_kill(smx_process_t process)
}
if (process->sem) {
}
if (process->sem) {
-
xbt_swag_remove(process, process->sem->sleeping
);
+
xbt_fifo_remove(process->sem->sleeping, process
);
if (process->waiting_action) {
SIMIX_unregister_action_to_semaphore(process->waiting_action, process->sem);
if (process->waiting_action) {
SIMIX_unregister_action_to_semaphore(process->waiting_action, process->sem);
@@
-298,7
+297,9
@@
XBT_INLINE xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
*/
XBT_INLINE smx_process_t SIMIX_process_self(void)
{
*/
XBT_INLINE smx_process_t SIMIX_process_self(void)
{
- return simix_global ? simix_global->current_process : NULL;
+ if(simix_global)
+ return simix_global->current_process;
+ return NULL;
}
/**
}
/**
@@
-422,9
+423,11
@@
void SIMIX_process_resume(smx_process_t process)
void SIMIX_process_change_host(smx_process_t process, char *source,
char *dest)
{
void SIMIX_process_change_host(smx_process_t process, char *source,
char *dest)
{
+ smx_host_t h1 = NULL;
+ smx_host_t h2 = NULL;
xbt_assert0((process != NULL), "Invalid parameters");
xbt_assert0((process != NULL), "Invalid parameters");
-
smx_host_t
h1 = SIMIX_host_get_by_name(source);
-
smx_host_t
h2 = SIMIX_host_get_by_name(dest);
+ h1 = SIMIX_host_get_by_name(source);
+ h2 = SIMIX_host_get_by_name(dest);
process->smx_host = h2;
xbt_swag_remove(process, h1->process_list);
xbt_swag_insert(process, h2->process_list);
process->smx_host = h2;
xbt_swag_remove(process, h1->process_list);
xbt_swag_insert(process, h2->process_list);