VMS/VMS_Implementations/VMS_impls/VMS__MC_shared

comparison PR.h @ 261:dafae55597ce

Getting closer -- added PRServ as built-in langlet (but still just copy) about to rework a lot of the Master code.. possibly eliminate core controller

author	Sean Halle <seanhalle@yahoo.com>
date	Tue, 23 Oct 2012 23:46:17 -0700
parents	999f2966a3e5
children	a5fa1e087c7e

comparison

equal deleted inserted replaced

-:b13e745dfc18
+:a716ed044c8d
 //================================ Typedefs =================================
 //
 typedef unsigned long long    TSCount;
-typedef struct _AnimSlot     AnimSlot;
+typedef struct _AnimSlot      AnimSlot;
-typedef struct _PRReqst      PRReqst;
+typedef struct _PRReqst       PRReqst;
 typedef struct _SlaveVP       SlaveVP;
 typedef struct _MasterVP      MasterVP;
 typedef struct _IntervalProbe IntervalProbe;
+typedef struct _PRMetaTask    PRMetaTask;
 typedef SlaveVP *(*SlaveAssigner)  ( void *, AnimSlot*); //semEnv, slot for HW info
 typedef void     (*RequestHandler) ( SlaveVP *, void * ); //prWReqst, semEnv
+typedef void     (*IndivReqHandler)( SlaveVP *, void * ); //prWReqst, semEnv
 typedef void     (*TopLevelFnPtr)  ( void *, SlaveVP * ); //initData, animSlv
 typedef void       TopLevelFn      ( void *, SlaveVP * ); //initData, animSlv
 typedef void     (*ResumeSlvFnPtr) ( SlaveVP *, void * );
 //=========== MEASUREMENT STUFF ==========
 MEAS__Insert_Counter_Handler
 //============= Request Related ===========
 //
-enum PRReqstType   //avoid starting enums at 0, for debug reasons
+enum PRReqstType  //avoid starting enums at 0, for debug reasons
 {
-semantic = 1,
+TaskCreate = 1,
-createReq,
+TaskEnd,
-dissipate,
+SlvCreate,
-PRSemantic      //goes with PRSemReqst below
+SlvDissipate,
+Language,
+Service,       //To invoke a PR provided equivalent of a language request (ex: probe)
+Hardware,
+IO,
+OSCall
 };
 struct _PRReqst
 {
-enum PRReqstType  reqType;//used for dissipate and in future for IO requests
+enum PRReqstType   reqType;//used for special forms that have PR behavior
-void              *semReqData;
+void              *semReq;
+PRProcess         *processReqIsIn;
+int32              langMagicNumber;
+PRMetaTask        *metaTask;
+TopLevelFn         topLevelFn;
+void              *initData;
+int32             *ID;
+//The request handling structure is a bit messy..  for special forms,
+// such as create and dissipate, the language inserts pointer to handler
+// fn directly into the request..  might change to this for all requests
+IndivReqHandler    handler; //pointer to handler fn for create, dissip, etc
 PRReqst *nextReqst;
 };
 //PRReqst
-enum PRSemReqstType   //These are equivalent to semantic requests, but for
+enum PRServReqType   //These are equivalent to semantic requests, but for
-{                     // PR's services available directly to app, like OS
+{                    // PR's services available directly to app, like OS
 make_probe = 1,    // and probe services -- like a PR-wide built-in lang
 throw_excp,
 openFile,
 otherIO
 };
 typedef struct
-{ enum PRSemReqstType reqType;
+{ enum PRServReqType   reqType;
 SlaveVP             *requestingSlv;
 char                *nameStr;  //for create probe
 char                *msgStr;   //for exception
 void                *exceptionData;
 }
-PRSemReq;
+PRServReq;
 //====================  Core data structures  ===================
 typedef struct
 };
 //AnimSlot
 enum VPtype
 { TaskSlotSlv = 1,//Slave tied to an anim slot, only animates tasks
-TaskExtraSlv,   //When a suspended task ends, the slave becomes this
+TaskFreeSlv,   //When a suspended task ends, the slave becomes this
-PersistentSlv,  //the VP is explicitly seen in the app code, or task suspends
+GenericSlv,     //the VP is explicitly seen in the app code, or task suspends
-Slave, //to be removed
 Master,
 Shutdown,
 Idle
 };
 void       *coreCtlrFramePtr; //restore before jmp back to core controller
 void       *coreCtlrStackPtr; //restore before jmp back to core controller
 //============ below this, no fields are used in asm =============
+void       *startOfStack;  //used to free, and to point slave to Fn
+PRProcess  *processSlaveIsIn;
+PRMetaTask *metaTask;
+enum VPtype typeOfVP;      //Slave vs Master vs Shutdown..
 int         slaveID;       //each slave given a globally unique ID
 int         coreAnimatedBy;
-void       *startOfStack;  //used to free, and to point slave to Fn
+int         numTimesAssignedToASlot;   //Each assign is for one work-unit, so is an ID
-enum VPtype typeOfVP;      //Slave vs Master vs Shutdown..
-int         assignCount;   //Each assign is for one work-unit, so IDs it
 //note, a scheduling decision is uniquely identified by the triple:
-// <slaveID, coreAnimatedBy, assignCount> -- used in record & replay
+// <slaveID, coreAnimatedBy, numTimesAssignedToASlot> -- used in record & replay
 //for comm -- between master and coreCtlr & btwn wrapper lib and plugin
 AnimSlot   *animSlotAssignedTo;
-PRReqst   *request;      //wrapper lib puts in requests, plugin takes out
+PRReqst    *request;      //wrapper lib puts in requests, plugin takes out
 void       *dataRetFromReq;//Return vals from plugin to Wrapper Lib
-//For using Slave as carrier for data
+//For language specific data that needs to be in the slave
 void       *semanticData;  //Lang saves lang-specific things in slave here
+//Task related stuff
+bool        needsTaskAssigned;
 //=========== MEASUREMENT STUFF ==========
 MEAS__Insert_Meas_Fields_into_Slave;
 float64     createPtInSecs;  //time VP created, in seconds
 //========================================
 };
 //============ below this, no fields are used in asm =============
 //Basic PR infrastructure
 SlaveVP        **masterVPs;
 AnimSlot      ***allAnimSlots;
-//plugin related
+PRProcess      **processes;
-PRSemEnv       **langlets;
+//move to processEnv      //Slave creation -- global count of slaves existing, across langs and processes
-//Slave creation -- global count of slaves existing, across langs and processes
 int32            numSlavesCreated;  //used to give unique ID to processor
-//no reasonable way to do fail-safe when have mult langlets and processes.. have to detect for each langlet separately
+int32            numTasksCreated;   //to give unique ID to a task
-//   int32            numSlavesAlive;    //used to detect fail-safe shutdown
 //Initialization related
 int32            setupComplete;      //use while starting up coreCtlr
 //Memory management related
 //Random number seeds -- random nums used in various places
 uint32_t seed1;
 uint32_t seed2;
+These_Prob_belong_in_PRPRocess;
+//   SlaveVP         *slotTaskSlvs[NUM_CORES][NUM_ANIM_SLOTS];
+//   int32            numLiveFreeTaskSlvs;
+//   int32            numLiveThreadSlvs;
+//   bool32          *coreIsDone;
+//   int32            numCoresDone;
+//   SlaveVP* idleSlv[NUM_CORES][NUM_ANIM_SLOTS];
+//   int shutdownInitiated;
 //=========== MEASUREMENT STUFF =============
 IntervalProbe   **intervalProbes;
-PtrToPrivDynArray *dynIntervalProbesInfo;
+PrivDynArrayInfo *dynIntervalProbesInfo;
 HashTable        *probeNameHashTbl;
 int32             masterCreateProbeID;
 float64           createPtInSecs; //real-clock time PR initialized
 Histogram       **measHists;
-PtrToPrivDynArray *measHistsInfo;
+PrivDynArrayInfo *measHistsInfo;
 MEAS__Insert_Susp_Meas_Fields_into_MasterEnv;
 MEAS__Insert_Master_Meas_Fields_into_MasterEnv;
 MEAS__Insert_Master_Lock_Meas_Fields_into_MasterEnv;
 MEAS__Insert_Malloc_Meas_Fields_into_MasterEnv;
 MEAS__Insert_Plugin_Meas_Fields_into_MasterEnv;
 }
 MasterEnv;
 //=====================
 typedef struct
-{ int32   langletID; //acts as index into array of langlets in master env
+{ int32     langMagicNumber; //indexes into hash array of semEnvs in PRProcess
-void   *langletSemEnv;
+PRSemEnv *chainedSemEnv;   //chains to semEnvs with same hash
-int32   langMagicNumber;
+void     *langSemEnv;
-SlaveAssigner    slaveAssigner;
-RequestHandler   requestHandler;
+SlaveAssigner   slaveAssigner;
-EndTaskHandler   endTaskHandler;
+RequestHandler  requestHdlr;
-//Tack slaves created, separately for each langlet (in each process)
+RequestHandler  createTaskHdlr;
-int32            numSlavesCreated;  //gives ordering to processor creation
+RequestHandler  endTaskHdlr;
-int32            numSlavesAlive;    //used to detect fail-safe shutdown
+RequestHandler  createSlaveHdlr;
+RequestHandler  dissipateSlaveHdlr;
+RequestHandler  semDataCreator;
+RequestHandler  semDataInitializer;
+//Track slaves created, separately for each langlet? (in each process)
+//   int32            numSlavesCreated;  //gives ordering to processor creation
+//   int32            numSlavesAlive;    //used to detect fail-safe shutdown
 //when multi-lang, master polls sem env's to find one with work in it..
 // in single-lang case, flag ignored, master always asks lang for work
 int32   hasWork;
 }
 PRSemEnv;
-//=====================  Top Processor level Data Strucs  ======================
+//The semantic env of every langlet must start with these two fields, so that
-typedef struct
+// PR can cast the void * to this struct, in order to access these two fields
+typedef struct
+{ int32     langMagicNumber;
+PRSemEnv *protoSemEnv;
+}
+PRLangSemEnv;
+//can cast any langlet's sem env to one of these, so PR can access values
+typedef struct
+{ int32     langMagicNumber;
+PRSemEnv *protoSemEnv;
+}
+PRServSemEnv;
+enum PRTaskType
+{ GenericSlave = 1,
+AtomicTask,
+SuspendedTask
+};
+struct _PRMetaTask
 {
+PRTaskType      taskType;
-}
+RequestHandler  reqHandler;      //Lang-specific hdlr for create, end, etc
-PRProcess;
+int32          *taskID;          //is standard PR ID
+SlaveVP        *slaveAssignedTo; //no valid until task animated
+TopLevelFn      topLevelFn;      //This is the Fn executes as the task
+void           *initData;        //The data taken by the function
+void           *langMetaTask;
+//NOTE: info needed for "wait" functionality is inside lang's metaTask
+};
+//PRMetaTask
+/*The language's meta task is cast to this struct, inside PR, then the
+* back pointer to protoMetaTask is set.  Keeps existence of PRMetaTask hidden
+* from plugin -- so can change later.
+*/
+typedef struct
+{ int32       langMagicNumber;
+PRMetaTask *protoMetaTask;
+}
+PRLangMetaTask;
+typedef struct
+{
+void (*freeFn)(void *);
+}
+PRSemDataTemplate;
+typedef struct
+{ PRSemDataTemplate **semDatas;
+PRSemDataTemplate **semDatasIter;
+int32               numSemDatas;
+}
+PRSemDataHolder;
+//=====================  Top Process level Data Strucs  ======================
 /*This structure holds all the information PR needs to manage a program.  PR
 * stores information about what percent of CPU time the program is getting,
 *
 */
 typedef struct
-{ //void               *semEnv;
+{
-//RequestHdlrFnPtr    requestHandler;
+PRSemEnv semEnvs[NUM_SEM_ENVS_IN_PROCESS];    //used as a hash table
-//SlaveAssignerFnPtr  slaveAssigner;
+PRSemEnv semEnvList[NUM_SEM_ENVS_IN_PROCESS]; //lines up the semEnvs, so can iterate through
-int32               numSlavesLive;
+int32    numSemEnvs;     //must be less than num sem envs.. used to iterate through
-void               *resultToReturn;
+int32           numLiveGenericSlaves;
+int32           numLiveFreeTaskSlaves;
+int32           numLiveTasks;
+bool32          coreIsDone[NUM_CORES][CACHE_LINE_SZ]; //Fixes false sharing
+void           *resultToReturn;
 SlaveVP        *seedSlv;
-//These are used to coordinate within the main function..?
+//These are used to coord with OS thread waiting for process to end
 bool32          executionIsComplete;
-pthread_mutex_t doneLock; //? not sure need these..?
+pthread_mutex_t doneLock;
 pthread_cond_t  doneCond;
 }
 PRProcess;
 }
 ThdParams;
 //=============================  Global Vars ================================
-volatile MasterEnv      *_PRMasterEnv __align_to_cacheline__;
+volatile MasterEnv      *_PRTopEnv __align_to_cacheline__;
 //these are global, but only used for startup and shutdown
 pthread_t       coreCtlrThdHandles[ NUM_CORES ]; //pthread's virt-procr state
 ThdParams      *coreCtlrThdParams [ NUM_CORES ];
 */
 //========== Startup and shutdown ==========
 void
 PR__start();
-void
-PR_SS__start_the_work_then_wait_until_done();
 SlaveVP*
 PR_SS__create_shutdown_slave();
 void
 PR_SS__shutdown();
 void
 PR_SS__cleanup_at_end_of_shutdown();
 void
-PR_SS__register_langlets_semEnv( PRSemEnv *semEnv, int32 VSs_MAGIC_NUMBER,
+PR_SS__register_langlets_semEnv( PRSemEnv *semEnv, SlaveVP  *seedVP, int32 VSs_MAGIC_NUMBER );
-SlaveVP  *seedVP );
 //==============    ===============
 inline SlaveVP *
 PR_int__create_slaveVP( TopLevelFnPtr fnPtr, void *dataParam );
 #define PR_PI__create_slaveVP PR_int__create_slaveVP
 #define PR_WL__create_slaveVP PR_int__create_slaveVP
-//Use this to create processor inside entry point & other places outside
+inline
-// the PR system boundary (IE, don't animate with a SlaveVP or MasterVP)
 SlaveVP *
-PR_ext__create_slaveVP( TopLevelFnPtr fnPtr, void *dataParam );
+PR_int__create_slot_slave();
-inline SlaveVP *
+inline
+SlaveVP *
 PR_int__create_slaveVP_helper( SlaveVP *newSlv,       TopLevelFnPtr  fnPtr,
 void      *dataParam, void           *stackLocs );
-inline void
+inline
+PRMetaTask *
+PR_int__create_generic_slave_meta_task( void *initData );
+inline
+void
 PR_int__reset_slaveVP_to_TopLvlFn( SlaveVP *slaveVP, TopLevelFnPtr fnPtr,
 void    *dataParam);
-inline void
+inline
+void
 PR_int__point_slaveVP_to_OneParamFn( SlaveVP *slaveVP, void *fnPtr,
 void    *param);
-inline void
+inline
+void
 PR_int__point_slaveVP_to_TwoParamFn( SlaveVP *slaveVP, void *fnPtr,
 void    *param1, void *param2);
+inline
 void
 PR_int__dissipate_slaveVP( SlaveVP *slaveToDissipate );
 #define PR_PI__dissipate_slaveVP PR_int__dissipate_slaveVP
 //WL: dissipate a SlaveVP by sending a request
-void
+inline
-PR_ext__dissipate_slaveVP( SlaveVP *slaveToDissipate );
+void
+PR_int__dissipate_slaveVP_multilang( SlaveVP *slaveToDissipate );
+inline
 void
 PR_int__throw_exception( char *msgStr, SlaveVP *reqstSlv, PRExcp *excpData );
 #define PR_PI__throw_exception  PR_int__throw_exception
 void
 PR_WL__throw_exception( char *msgStr, SlaveVP *reqstSlv,  PRExcp *excpData );
 #define PR_App__throw_exception PR_WL__throw_exception
+inline
 void *
-PR_int__give_sem_env_for( SlaveVP *animSlv );
+PR_int__give_sem_env_for_slave( SlaveVP *slave, int32 magicNumber );
-#define PR_PI__give_sem_env_for  PR_int__give_sem_env_for
+#define PR_PI__give_sem_env_for  PR_int__give_sem_env_for_slave
-#define PR_SS__give_sem_env_for  PR_int__give_sem_env_for
+#define PR_SS__give_sem_env_for_slave  PR_int__give_sem_env_for_slave
-//No WL version -- not safe!  if use in WL, be sure data rd & wr is stable
+//No WL version -- not safe!  if use env in WL, be sure data rd & wr is stable
+inline
+PRSemEnv *
+PR_int__give_proto_sem_env_for_slave( SlaveVP *slave, int32 magicNumber );
+#define PR_PI__give_proto_sem_env_for  PR_int__give_proto_sem_env_for_slave
+#define PR_SS__give_proto_sem_env_for_slave  PR_int__give_proto_sem_env_for_slave
+//No WL version -- not safe!  if use env in WL, be sure data rd & wr is stable
+inline
+void *
+PR_int__give_sem_env_from_process( PRProcess *process, int32 magicNumer );
+#define PR_PI__give_sem_env_from_process  PR_int__give_sem_env_from_process
+#define PR_SS__give_sem_env_from_process  PR_int__give_sem_env_from_process
+//#define PR_WL__give_sem_env_from_process  PR_int__give_sem_env_from_process
+//No WL version -- not safe!  if use env in WL, be sure data rd & wr is stable
+inline
+void *
+PR_int__give_sem_data( SlaveVP *slave, int32 magicNumer );
+#define PR_PI__give_sem_data  PR_int__give_sem_data
+#define PR_SS__give_sem_data  PR_int__give_sem_data
+#define PR_WL__give_sem_data  PR_int__give_sem_data
+#define PR_int__give_lang_meta_task( slave, magicNumber )\
+slave->metaTask->langMetaTask;
+#define PR_PI__give_lang_meta_task  PR_int__give_lang_meta_task
+#define PR_SS__give_lang_meta_task  PR_int__give_lang_meta_task
+#define PR_WL__give_lang_meta_task  PR_int__give_lang_meta_task
+inline
+SlaveVP *
+PR_PI__give_slave_assigned_to( PRLangMetaTask *langMetaTask );
+void
+idle_fn(void* data, SlaveVP *animatingSlv);
 inline void
 PR_int__get_master_lock();
-#define PR_int__release_master_lock() _PRMasterEnv->masterLock = UNLOCKED
+#define PR_int__release_master_lock() _PRTopEnv->masterLock = UNLOCKED
 inline uint32_t
 PR_int__randomNumber();
 //==============  Request Related  ===============
 void
-PR_int__suspend_slaveVP_and_send_req( SlaveVP *callingSlv );
+PR_WL__suspend_slaveVP_and_send_req( SlaveVP *callingSlv );
 inline void
 PR_WL__add_sem_request_in_mallocd_PRReqst( void *semReqData, SlaveVP *callingSlv );
 inline void
-PR_WL__send_sem_request( void *semReqData, SlaveVP *callingSlv );
+PR_WL__send_sem_request( void *semReq, SlaveVP *callingSlv, int32 magicNum );
 void
 PR_WL__send_create_slaveVP_req( void *semReqData, SlaveVP *reqstingSlv );
 void inline
 PR_WL__send_dissipate_req( SlaveVP *prToDissipate );
 inline void
-PR_WL__send_PRSem_request( void *semReqData, SlaveVP *callingSlv );
+PR_WL__send_service_request( void *semReqData, SlaveVP *callingSlv );
 PRReqst *
 PR_PI__take_next_request_out_of( SlaveVP *slaveWithReq );
 //#define PR_PI__take_next_request_out_of( slave ) slave->requests
 //inline void *
 //PR_PI__take_sem_reqst_from( PRReqst *req );
 #define PR_PI__take_sem_reqst_from( req ) req->semReqData
 void inline
-PR_PI__handle_PRSemReq( PRReqst *req, SlaveVP *requestingSlv, void *semEnv,
+PR_int__handle_PRServiceReq( PRReqst *req, SlaveVP *requestingSlv, void *semEnv,
 ResumeSlvFnPtr resumeSlvFnPtr );
 //======================== MEASUREMENT ======================
 uint64
 PR_WL__give_num_plugin_cycles();
 //========================= Utilities =======================
 inline char *
 PR_int__strDup( char *str );
+//=========================  PR request handlers  ========================
+void inline
+handleMakeProbe( PRServReq *semReq, void *semEnv, ResumeSlvFnPtr resumeFn );
+void inline
+handleThrowException( PRServReq *semReq, void *semEnv, ResumeSlvFnPtr resumeFn );
+//=======================================================================
 //========================= Probes =======================
 #include "Services_Offered_by_PR/Measurement_and_Stats/probes.h"
 //================================================
 #endif	/* _PR_H */

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

comparison PR.h @ 261:dafae55597ce