VMS/VMS_Implementations/VMS_impls/VMS__MC_shared

comparison vmalloc.c @ 136:f1374d5dbb98

set currentMasterProcrID to 0 for corrent free on shutdown

author	Merten Sach <msach@mailbox.tu-berlin.de>
date	Fri, 16 Sep 2011 20:13:33 +0200
parents	a9b72021f053
children	99343ffe1918

comparison

equal deleted inserted replaced

-:0877c22b1191
+:314cb94c95a0
 #include <stdlib.h>
 #include <stdio.h>
 #include "VMS.h"
 #include "Histogram/Histogram.h"
+inline void
+sendFreeReqst_lib(int receiverID, void *ptrToFree, VirtProcr *animPr);
+inline void
+sendFreeReqst_master(int receiverID, void *ptrToFree);
 /*Helper function
 *Insert a newly generated free chunk into the first spot on the free list.
 * The chunk is cast as a MallocProlog, so the various pointers in it are
 * accessed with C's help -- and the size of the prolog is easily added to
 VMS__malloc_on_core( size_t sizeRequested, int procrID)
 { MallocProlog *foundElem = NULL, *currElem, *newElem;
 MallocPrologAllocated *returnElem;
 ssize_t        amountExtra, sizeConsumed,sizeOfFound;
 uint32        foundElemIsTopOfHeap;
-printf("Malloc on core %d\n", procrID);
 //============================= MEASUREMENT STUFF ========================
 #ifdef MEAS__TIME_MALLOC
 int32 startStamp, endStamp;
 saveLowTimeStampCountInto( startStamp );
 {
 VMS__free_on_core(ptrToFree, _VMSMasterEnv->currentMasterProcrID);
 }
 else
 {
-//Request from other Core
+sendFreeReqst_master(chunk->procrID, ptrToFree);
 }
 }
 /*
 * This free is called for the plugins. It decides whether the allocation of
 */
 void
 VMS__free_in_lib(void *ptrToFree, VirtProcr *VProc)
 {
 MallocPrologAllocated *chunk = (MallocPrologAllocated*)ptrToFree - 1;
-printf("Free from core %d for core %d\n", VProc->coreAnimatedBy, chunk->procrID);
 if(chunk->procrID == VProc->coreAnimatedBy)
 {
 VMS__free_on_core(ptrToFree, VProc->coreAnimatedBy);
 }
 else
 {
-//Request from other Core
+sendFreeReqst_lib(chunk->procrID, ptrToFree, VProc);
 }
 }
+/*
+* This is called form a masterVP and request an free from a different masterVP.
+* The free of the request structure is done after the request is handled.
+*/
+inline void
+sendFreeReqst_master(int receiverID, void *ptrToFree)
+{
+InterVMSCoreReqst *freeReqst = VMS__malloc(sizeof(InterVMSCoreReqst));
+freeReqst->freePtr = ptrToFree;
+freeReqst->secondReqType = transfer_free_ptr;
+sendInterMasterReqst(receiverID, (InterMasterReqst*)freeReqst);
+}
+/*
+* This is called if the free is called from the plugin. This requests an inter
+* master request from his master.
+*/
+inline void
+sendFreeReqst_lib(int receiverID, void *ptrToFree, VirtProcr *animPr )
+{
+VMSSemReq reqData;
+InterVMSCoreReqst *freeReqst = VMS__malloc(sizeof(InterVMSCoreReqst));
+freeReqst->freePtr = ptrToFree;
+freeReqst->secondReqType = transfer_free_ptr;
+reqData.reqType  = interMasterReqst;
+reqData.receiverID   = receiverID;
+reqData.data  = (void*)freeReqst;
+VMS__send_VMSSem_request( (void*)&reqData, animPr );
+}
 /*This is sequential code -- only to be called from the Master
 * When free, subtract the size of prolog from pointer, then cast it to a
 * MallocProlog.  Then check the nextLower and nextHigher chunks to see if
 * one or both are also free, and coalesce if so, and if neither free, then
 void
 VMS__free_in_ext( void *ptrToFree )
 {
 //just risk system-stack faults until get this figured out
 free( ptrToFree );
-//TODO: fix this -- so
 }
 /*Designed to be called from the main thread outside of VMS, during init
 */
 /*Designed to be called from the main thread outside of VMS, during cleanup
 */
 void
-VMS_ext__free_free_list( MallocProlog* freeListHeads[] )
+VMS_ext__free_free_list( MallocProlog* freeListHead)
 {
 //stashed a ptr to the one and only bug chunk malloc'd from OS in the
 // free list head's next lower in mem pointer
-int i;
+free( freeListHead->nextLowerInMem );
-for(i=0; i<NUM_CORES; i++)
-{
-free( freeListHeads[i]->nextLowerInMem );
-}
 //don't free the head -- it'll be in an array eventually -- free whole
 // array when all the free lists linked from it have already been freed
 }

Mercurial > cgi-bin > hgwebdir.cgi > VMS > VMS_Implementations > VMS_impls > VMS__MC_shared_impl

comparison vmalloc.c @ 136:f1374d5dbb98