# HG changeset patch # User Sean Halle # Date 1362749583 28800 # Node ID daaf26b3ffe5b06da7f3160754fc7f3326b55537 # Parent 0162554f6ef5905e1f922cba766b7da6fae24b95 ML_dev -- works in both sequential and concurrent modes diff -r 0162554f6ef5 -r daaf26b3ffe5 VSs.c --- a/VSs.c Mon Mar 04 00:41:47 2013 -0800 +++ b/VSs.c Fri Mar 08 05:33:03 2013 -0800 @@ -312,6 +312,8 @@ reqData.senderSlv = senderSlv; reqData.nextReqInHashEntry = NULL; + DEBUG__printf3(dbgRqstHdlr,"WL: send from %d to %d on %d", reqData.senderID[1], reqData.receiverID[1], senderSlv->coreAnimatedBy); + PR_WL__send_lang_request( &reqData, (RequestHandler)&VSs__handleSendFromTo, senderSlv, VSs_MAGIC_NUMBER ); @@ -363,7 +365,7 @@ reqData.receiverSlv = receiverSlv; reqData.nextReqInHashEntry = NULL; - DEBUG__printf2(dbgRqstHdlr,"WL: receive from %d to: %d", reqData.senderID[1], reqData.receiverID[1]); + DEBUG__printf3(dbgRqstHdlr,"WL: receive from %d to %d on %d", reqData.senderID[1], reqData.receiverID[1], receiverSlv->coreAnimatedBy); PR_WL__send_lang_request( &reqData, (RequestHandler)&VSs__handleReceiveFromTo, receiverSlv, VSs_MAGIC_NUMBER ); diff -r 0162554f6ef5 -r daaf26b3ffe5 VSs.h --- a/VSs.h Mon Mar 04 00:41:47 2013 -0800 +++ b/VSs.h Fri Mar 08 05:33:03 2013 -0800 @@ -128,20 +128,20 @@ enum VSsReqType { submit_task = 1, - end_task, - create_slave, - create_slave_w_aff, - dissipate_slave, + end_task = 2, + create_slave = 3, + create_slave_w_aff = 4, + dissipate_slave = 5, //=============================== - send_type_to, - receive_type_to, - send_from_to, - receive_from_to, + send_type_to = 6, + receive_type_to = 7, + send_from_to = 8, + receive_from_to = 9, //=============================== - taskwait, - activity_cease_wait, - wait_then_shutdown, - shutdown + taskwait = 10, + activity_cease_wait = 11, + wait_then_shutdown = 12, + shutdown = 13 }; struct _VSsLangReq diff -r 0162554f6ef5 -r daaf26b3ffe5 VSs_Request_Handlers.c --- a/VSs_Request_Handlers.c Mon Mar 04 00:41:47 2013 -0800 +++ b/VSs_Request_Handlers.c Fri Mar 08 05:33:03 2013 -0800 @@ -932,7 +932,7 @@ HashEntry *entry; HashTable *commHashTbl = langEnv->commHashTbl; - DEBUG__printf2(dbgRqstHdlr,"SendFromTo req from task %d to %d", + DEBUG__printf2(dbgRqstHdlr,"PI: SendFromTo req from task %d to %d", langReq->senderID[1],langReq->receiverID[1]) receiverID = langReq->receiverID; //For "send", know both send & recv procrs