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
ignore some cruft generated by scala
[simgrid.git]
/
src
/
msg
/
instr_msg_vm.c
diff --git
a/src/msg/instr_msg_vm.c
b/src/msg/instr_msg_vm.c
index
770f4cf
..
5387c10
100644
(file)
--- a/
src/msg/instr_msg_vm.c
+++ b/
src/msg/instr_msg_vm.c
@@
-1,19
+1,18
@@
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012
-2014
. 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
-
* under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "msg_private.h"
#include "msg_private.h"
-#ifdef HAVE_TRACING
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_vm, instr, "MSG VM");
char *instr_vm_id (msg_vm_t vm, char *str, int len)
{
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_vm, instr, "MSG VM");
char *instr_vm_id (msg_vm_t vm, char *str, int len)
{
- return instr_vm_id_2 (MSG_
get_vm
_name(vm), str, len);
+ return instr_vm_id_2 (MSG_
vm_get
_name(vm), str, len);
}
char *instr_vm_id_2 (const char *vm_name, char *str, int len)
}
char *instr_vm_id_2 (const char *vm_name, char *str, int len)
@@
-46,7
+45,7
@@
void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_h
PJ_container_free(existing_container);
//create new container on the new_host location
PJ_container_free(existing_container);
//create new container on the new_host location
-
msg =
PJ_container_new(instr_vm_id(vm, str, len), INSTR_MSG_VM, PJ_container_get(SIMIX_host_get_name(new_host)));
+ PJ_container_new(instr_vm_id(vm, str, len), INSTR_MSG_VM, PJ_container_get(SIMIX_host_get_name(new_host)));
//end link
msg = PJ_container_get(instr_vm_id(vm, str, len));
//end link
msg = PJ_container_get(instr_vm_id(vm, str, len));
@@
-55,7
+54,7
@@
void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_h
}
}
}
}
-void TRACE_msg_vm_create
(const char *vm_name, msg_host_t host)
+void TRACE_msg_vm_create(const char *vm_name, msg_host_t host)
{
if (TRACE_msg_vm_is_enabled()){
int len = INSTR_DEFAULT_STR_SIZE;
{
if (TRACE_msg_vm_is_enabled()){
int len = INSTR_DEFAULT_STR_SIZE;
@@
-66,7
+65,7
@@
void TRACE_msg_vm_create (const char *vm_name, msg_host_t host)
}
}
}
}
-void TRACE_msg_vm_start
(msg_vm_t vm)
+void TRACE_msg_vm_start(msg_vm_t vm)
{
if (TRACE_msg_vm_is_enabled()){
int len = INSTR_DEFAULT_STR_SIZE;
{
if (TRACE_msg_vm_is_enabled()){
int len = INSTR_DEFAULT_STR_SIZE;
@@
-74,7
+73,7
@@
void TRACE_msg_vm_start (msg_vm_t vm)
container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type);
container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type);
- val_t value = PJ_value_get
("start", type);
+ val_t value = PJ_value_get
_or_new ("start", "0 0 1", type); //start is blue
new_pajePushState (MSG_get_clock(), vm_container, type, value);
}
new_pajePushState (MSG_get_clock(), vm_container, type, value);
}
@@
-100,7
+99,7
@@
void TRACE_msg_vm_suspend(msg_vm_t vm)
container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type);
container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type);
- val_t value = PJ_value_get
("suspend", type);
+ val_t value = PJ_value_get
_or_new ("suspend", "1 0 0", type); //suspend is red
new_pajePushState (MSG_get_clock(), vm_container, type, value);
}
}
new_pajePushState (MSG_get_clock(), vm_container, type, value);
}
}
@@
-117,7
+116,7
@@
void TRACE_msg_vm_resume(msg_vm_t vm)
}
}
}
}
-void TRACE_msg_vm_s
leep_in
(msg_vm_t vm)
+void TRACE_msg_vm_s
ave
(msg_vm_t vm)
{
if (TRACE_msg_vm_is_enabled()){
int len = INSTR_DEFAULT_STR_SIZE;
{
if (TRACE_msg_vm_is_enabled()){
int len = INSTR_DEFAULT_STR_SIZE;
@@
-125,12
+124,12
@@
void TRACE_msg_vm_sleep_in(msg_vm_t vm)
container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type);
container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type);
- val_t value = PJ_value_get
("sleep", type);
+ val_t value = PJ_value_get
_or_new ("save", "0 1 0", type); //save is green
new_pajePushState (MSG_get_clock(), vm_container, type, value);
}
}
new_pajePushState (MSG_get_clock(), vm_container, type, value);
}
}
-void TRACE_msg_vm_
sleep_out
(msg_vm_t vm)
+void TRACE_msg_vm_
restore
(msg_vm_t vm)
{
if (TRACE_msg_vm_is_enabled()){
int len = INSTR_DEFAULT_STR_SIZE;
{
if (TRACE_msg_vm_is_enabled()){
int len = INSTR_DEFAULT_STR_SIZE;
@@
-154,5
+153,3
@@
void TRACE_msg_vm_end(msg_vm_t vm)
PJ_container_free (container);
}
}
PJ_container_free (container);
}
}
-
-#endif /* HAVE_TRACING */