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
at least this one works. leak--
[simgrid.git]
/
examples
/
msg
/
chainsend
/
messages.c
diff --git
a/examples/msg/chainsend/messages.c
b/examples/msg/chainsend/messages.c
index 177b4e85b0228b1648fac2c800ff56036d945740..253cdf7f4cf7d29dc95f795307bb3b3ca777ba37 100644
(file)
--- a/
examples/msg/chainsend/messages.c
+++ b/
examples/msg/chainsend/messages.c
@@
-1,31
+1,30
@@
#include "messages.h"
#include "messages.h"
-msg_task_t task_message_new(e_message_type type,
const char *issuer_hostname, const char *mailbox
)
+msg_task_t task_message_new(e_message_type type,
unsigned int len
)
{
message_t msg = xbt_new(s_message_t, 1);
msg->type = type;
{
message_t msg = xbt_new(s_message_t, 1);
msg->type = type;
- msg->
issuer_hostname = issuer_hostname
;
- msg->
mailbox = mailbox
;
- msg_task_t task = MSG_task_create(NULL, 0,
MESSAGE_SIZE, msg);
+ msg->
prev_hostname = NULL
;
+ msg->
next_hostname = NULL
;
+ msg_task_t task = MSG_task_create(NULL, 0,
len, msg);
return task;
}
return task;
}
-msg_task_t task_message_chain_new(const char
*issuer_hostname, const char *mailbox, const char* prev, const char *next
)
+msg_task_t task_message_chain_new(const char
* prev, const char *next, const unsigned int num_pieces
)
{
{
- msg_task_t task = task_message_new(MESSAGE_BUILD_CHAIN,
issuer_hostname, mailbox
);
+ msg_task_t task = task_message_new(MESSAGE_BUILD_CHAIN,
MESSAGE_BUILD_CHAIN_SIZE
);
message_t msg = MSG_task_get_data(task);
message_t msg = MSG_task_get_data(task);
- msg->prev_hostname = prev;
- msg->next_hostname = next;
+ msg->prev_hostname = xbt_strdup(prev);
+ msg->next_hostname = xbt_strdup(next);
+ msg->num_pieces = num_pieces;
return task;
}
return task;
}
-msg_task_t task_message_data_new(const char *
issuer_hostname, const char *mailbox, const char *
block, unsigned int len)
+msg_task_t task_message_data_new(const char *block, unsigned int len)
{
{
- msg_task_t task = task_message_new(MESSAGE_SEND_DATA, issuer_hostname, mailbox);
- //if (strcmp(mailbox, "host4") == 0)
- //MSG_task_set_category(task, mailbox);
+ msg_task_t task = task_message_new(MESSAGE_SEND_DATA, MESSAGE_SEND_DATA_HEADER_SIZE + len);
message_t msg = MSG_task_get_data(task);
msg->data_block = block;
msg->data_length = len;
message_t msg = MSG_task_get_data(task);
msg->data_block = block;
msg->data_length = len;
@@
-33,11
+32,6
@@
msg_task_t task_message_data_new(const char *issuer_hostname, const char *mailbo
return task;
}
return task;
}
-msg_task_t task_message_end_data_new(const char *issuer_hostname, const char *mailbox)
-{
- return task_message_new(MESSAGE_END_DATA, issuer_hostname, mailbox);
-}
-
void task_message_delete(void *task)
{
message_t msg = MSG_task_get_data(task);
void task_message_delete(void *task)
{
message_t msg = MSG_task_get_data(task);