# HG changeset patch # User Merten Sach # Date 1316182691 -7200 # Node ID 4977aea58ca0125888ef4308833c41d569cacf01 # Parent bb2500771be80c152236ed969b64f78a1f4f1607 Changed calls to VMS__malloc diff -r bb2500771be8 -r 4977aea58ca0 VPThread_Request_Handlers.c --- a/VPThread_Request_Handlers.c Wed Sep 07 18:08:29 2011 +0200 +++ b/VPThread_Request_Handlers.c Fri Sep 16 16:18:11 2011 +0200 @@ -184,12 +184,6 @@ Meas_endCondSignal } - - -//============================================================================ -// -/* - */ void inline handleMalloc(VPThdSemReq *semReq, VirtProcr *requestingPr,VPThdSemEnv *semEnv) { void *ptr; diff -r bb2500771be8 -r 4977aea58ca0 VPThread_lib.c --- a/VPThread_lib.c Wed Sep 07 18:08:29 2011 +0200 +++ b/VPThread_lib.c Fri Sep 16 16:18:11 2011 +0200 @@ -224,7 +224,6 @@ } } - /*Frees any memory allocated by VPThread__init() then calls VMS__shutdown */ void @@ -332,29 +331,17 @@ void * VPThread__malloc( size_t sizeToMalloc, VirtProcr *animPr ) - { VPThdSemReq reqData; - - reqData.reqType = malloc_req; - reqData.sizeToMalloc = sizeToMalloc; - reqData.requestingPr = animPr; - - VMS__send_sem_request( &reqData, animPr ); - - return animPr->dataRetFromReq; - } +{ + return VMS__malloc_in_lib(sizeToMalloc, animPr); +} /*Sends request to Master, which does the work of freeing */ void VPThread__free( void *ptrToFree, VirtProcr *animPr ) - { VPThdSemReq reqData; - - reqData.reqType = free_req; - reqData.ptrToFree = ptrToFree; - reqData.requestingPr = animPr; - - VMS__send_sem_request( &reqData, animPr ); + { + return VMS__free_in_lib(ptrToFree, animPr); }