changeset 35:daaf26b3ffe5 ML_dev

ML_dev -- works in both sequential and concurrent modes
author Sean Halle <seanhalle@yahoo.com>
date Fri, 08 Mar 2013 05:33:03 -0800
parents 0162554f6ef5
children
files VSs.c VSs.h VSs_Request_Handlers.c
diffstat 3 files changed, 16 insertions(+), 14 deletions(-) [+]
line diff
     1.1 --- a/VSs.c	Mon Mar 04 00:41:47 2013 -0800
     1.2 +++ b/VSs.c	Fri Mar 08 05:33:03 2013 -0800
     1.3 @@ -312,6 +312,8 @@
     1.4     reqData.senderSlv   = senderSlv;
     1.5  
     1.6     reqData.nextReqInHashEntry = NULL;
     1.7 +      DEBUG__printf3(dbgRqstHdlr,"WL: send from %d to %d on %d", reqData.senderID[1], reqData.receiverID[1], senderSlv->coreAnimatedBy);
     1.8 +      
     1.9  
    1.10     PR_WL__send_lang_request( &reqData, (RequestHandler)&VSs__handleSendFromTo,
    1.11                                                    senderSlv, VSs_MAGIC_NUMBER );
    1.12 @@ -363,7 +365,7 @@
    1.13     reqData.receiverSlv = receiverSlv;
    1.14  
    1.15     reqData.nextReqInHashEntry = NULL;
    1.16 -      DEBUG__printf2(dbgRqstHdlr,"WL: receive from %d to: %d", reqData.senderID[1], reqData.receiverID[1]);
    1.17 +      DEBUG__printf3(dbgRqstHdlr,"WL: receive from %d to %d on %d", reqData.senderID[1], reqData.receiverID[1], receiverSlv->coreAnimatedBy);
    1.18        
    1.19     PR_WL__send_lang_request( &reqData, (RequestHandler)&VSs__handleReceiveFromTo,
    1.20                               receiverSlv, VSs_MAGIC_NUMBER );
     2.1 --- a/VSs.h	Mon Mar 04 00:41:47 2013 -0800
     2.2 +++ b/VSs.h	Fri Mar 08 05:33:03 2013 -0800
     2.3 @@ -128,20 +128,20 @@
     2.4  enum VSsReqType
     2.5   {
     2.6     submit_task = 1,
     2.7 -   end_task,
     2.8 -   create_slave,
     2.9 -   create_slave_w_aff,
    2.10 -   dissipate_slave,
    2.11 +   end_task = 2,
    2.12 +   create_slave = 3,
    2.13 +   create_slave_w_aff = 4,
    2.14 +   dissipate_slave = 5,
    2.15     //===============================
    2.16 -   send_type_to,
    2.17 -   receive_type_to,
    2.18 -   send_from_to,
    2.19 -   receive_from_to,
    2.20 +   send_type_to = 6,
    2.21 +   receive_type_to = 7,
    2.22 +   send_from_to = 8,
    2.23 +   receive_from_to = 9,
    2.24     //===============================
    2.25 -   taskwait,
    2.26 -   activity_cease_wait,
    2.27 -   wait_then_shutdown,
    2.28 -   shutdown
    2.29 +   taskwait = 10,
    2.30 +   activity_cease_wait = 11,
    2.31 +   wait_then_shutdown = 12,
    2.32 +   shutdown = 13
    2.33   };
    2.34  
    2.35  struct _VSsLangReq
     3.1 --- a/VSs_Request_Handlers.c	Mon Mar 04 00:41:47 2013 -0800
     3.2 +++ b/VSs_Request_Handlers.c	Fri Mar 08 05:33:03 2013 -0800
     3.3 @@ -932,7 +932,7 @@
     3.4     HashEntry   *entry;
     3.5     HashTable   *commHashTbl = langEnv->commHashTbl;
     3.6  
     3.7 -         DEBUG__printf2(dbgRqstHdlr,"SendFromTo req from task %d to %d",
     3.8 +         DEBUG__printf2(dbgRqstHdlr,"PI: SendFromTo req from task %d to %d",
     3.9                          langReq->senderID[1],langReq->receiverID[1])
    3.10     
    3.11     receiverID  = langReq->receiverID; //For "send", know both send & recv procrs