VMS/VMS_Implementations/VMS_impls/VMS__MC_shared

comparison VMS.c @ 139:99798e4438a6

Merge of Malloc2 and inter master requests

author	Merten Sach <msach@mailbox.tu-berlin.de>
date	Mon, 19 Sep 2011 16:12:01 +0200
parents	def70e32cf2c 99343ffe1918
children	2c8f3cf6c058

comparison

equal deleted inserted replaced

-:36c2d5074306
+:e2b9bc75f03c
 #include <inttypes.h>
 #include <sys/time.h>
 #include "VMS.h"
 #include "ProcrContext.h"
+#include "scheduling.h"
 #include "Queue_impl/BlockingQueue.h"
 #include "Histogram/Histogram.h"
 #define thdAttrs NULL
 _VMSMasterEnv = malloc( sizeof(MasterEnv) );
 //Very first thing put into the master env is the free-list, seeded
 // with a massive initial chunk of memory.
 //After this, all other mallocs are VMS__malloc.
-_VMSMasterEnv->freeLists        = VMS_ext__create_free_list();
+int i;
+for(i=0; i<NUM_CORES; i++)
+{
+_VMSMasterEnv->freeLists[i]        = VMS_ext__create_free_list();
+_VMSMasterEnv->interMasterRequestsFor[i] = NULL;
+_VMSMasterEnv->interMasterRequestsSentBy[i] = NULL;
+}
+_VMSMasterEnv->currentMasterProcrID = 0;
 //============================= MEASUREMENT STUFF ========================
 #ifdef MEAS__TIME_MALLOC
 _VMSMasterEnv->mallocTimeHist  = makeFixedBinHistExt( 100, 0, 100,
 "malloc_time_hist");
 callingPr->requests = &req;
 VMS__suspend_procr( callingPr );
 }
+void inline
+VMS__send_inter_plugin_req( void *reqData, int32 targetMaster,
+VirtProcr *requestingMaster )
+{ _VMSMasterEnv->interMasterRequestsFor[targetMaster] =
+(InterMasterReqst *) reqData;
+}
+void inline
+VMS__send_inter_VMSCore_req( InterVMSCoreReqst *reqData,
+int32 targetMaster, VirtProcr *requestingMaster )
+{ _VMSMasterEnv->interMasterRequestsFor[targetMaster] =
+(InterMasterReqst *) reqData;
+}
 /*
 */
 VMSReqst *
 VMS__take_next_request_out_of( VirtProcr *procrWithReq )
 { VMSSemReq     *semReq;
 IntervalProbe *newProbe;
 semReq = req->semReqData;
-newProbe          = VMS__malloc( sizeof(IntervalProbe) );
+switch(semReq->reqType){
-newProbe->nameStr = VMS__strDup( semReq->nameStr );
+case createProbe:
-newProbe->hist    = NULL;
+newProbe          = VMS__malloc( sizeof(IntervalProbe) );
-newProbe->schedChoiceWasRecorded = FALSE;
+newProbe->nameStr = VMS__strDup( (char*)semReq->data );
+newProbe->hist    = NULL;
-//This runs in masterVP, so no race-condition worries
+newProbe->schedChoiceWasRecorded = FALSE;
-newProbe->probeID =
-addToDynArray( newProbe, _VMSMasterEnv->dynIntervalProbesInfo );
+//This runs in masterVP, so no race-condition worries
+newProbe->probeID =
-requestingPr->dataRetFromReq = newProbe;
+addToDynArray( newProbe, _VMSMasterEnv->dynIntervalProbesInfo );
+requestingPr->dataRetFromReq = newProbe;
-(*resumePrFnPtr)( requestingPr, semEnv );
+break;
+case interMasterReqst:
+sendInterMasterReqst(semReq->receiverID,
+(InterMasterReqst*)semReq->data);
+break;
+default:
+break;
+}
+resumePrFnPtr( requestingPr, semEnv );
 }
 /*This must be called by the request handler plugin -- it cannot be called
 // been alloc'd with VMS__malloc, or freed by the level above animPr.
 //So, all that's left to free here is the stack and the VirtProcr struc
 // itself
 //Note, should not stack-allocate initial data -- no guarantee, in
 // general that creating processor will outlive ones it creates.
-VMS__free( animatingPr->startOfStack );
-VMS__free( animatingPr );
+VMS__free( animatingPr->startOfStack);
+VMS__free( animatingPr);
 }
 //TODO: look at architecting cleanest separation between request handler
 // and master loop, for dissipate, create, shutdown, and other non-semantic
 * point is it sure that all results have completed.
 */
 void
 VMS__shutdown()
 { int coreIdx;
-VirtProcr *shutDownPr;
+//Send a shutdown Request to all MasterLoops.
-//create the shutdown processors, one for each core loop -- put them
-// directly into the Q -- each core will die when gets one
 for( coreIdx=0; coreIdx < NUM_CORES; coreIdx++ )
 {    //Note, this is running in the master
-shutDownPr = VMS__create_procr( &endOSThreadFn, NULL );
+InterVMSCoreReqst *shutdownReqst = VMS__malloc(sizeof(InterVMSCoreReqst));
-writeVMSQ( shutDownPr, _VMSMasterEnv->readyToAnimateQs[coreIdx] );
+shutdownReqst->secondReqType = shutdownVP;
+sendInterMasterReqst(coreIdx, (InterMasterReqst*)shutdownReqst);
 }
 }
 * processor that animates this function, (this fn is transfering the
 * animator of the AppVP that is in turn animating this function over
 * to core loop function -- note that this slices out a level of virtual
 * processors).
 */
+/*
 void
 endOSThreadFn( void *initData, VirtProcr *animatingPr )
 {
 #ifdef SEQUENTIAL
 asmTerminateCoreLoopSeq(animatingPr);
 #else
 asmTerminateCoreLoop(animatingPr);
 #endif
 }
+*/
 /*This is called from the startup & shutdown
 */
 void
 VMS__cleanup_at_end_of_shutdown()
 {
+// Set to zero so that all data structures are freed correctly
+_VMSMasterEnv->currentMasterProcrID = 0;
 //unused
 //VMSQueueStruc **readyToAnimateQs;
 //int              coreIdx;
 //VirtProcr      **masterVPs;
 //SchedSlot     ***allSchedSlots; //ptr to array of ptrs
 freeDynArrayDeep( _VMSMasterEnv->dynIntervalProbesInfo, &VMS__free_probe);
 #endif
 //========================================================================
 */
 //These are the only two that use system free
-VMS_ext__free_free_list( _VMSMasterEnv->freeLists );
+int i;
+for(i=0; i<NUM_CORES; i++)
+VMS_ext__free_free_list( _VMSMasterEnv->freeLists[i]);
 free( (void *)_VMSMasterEnv );
 }
 //================================

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

comparison VMS.c @ 139:99798e4438a6