VMS/VMS_Implementations/VMS_impls/VMS__MC_shared

comparison VMS.c @ 109:659299627e70

counters done

author	Nina Engelhardt
date	Tue, 02 Aug 2011 17:16:12 +0200
parents	3bc3b89630c7
children	724c7a0b687f

comparison

equal deleted inserted replaced

-:626b11cad78c
+:549f4f51e4d4
 #include "VMS.h"
 #include "ProcrContext.h"
 #include "Queue_impl/BlockingQueue.h"
 #include "Histogram/Histogram.h"
+#include <unistd.h>
+#include <fcntl.h>
+#include <linux/types.h>
 #include <linux/perf_event.h>
-#include <syscall.h>
+#include <errno.h>
-#include <sys/prctl.h>
+#include <sys/syscall.h>
+#include <linux/prctl.h>
 #define thdAttrs NULL
 //===========================================================================
 void
 "master lock high time hist");
 #endif
 MakeTheMeasHists();
-#ifdef MEAS__PERF_COUNTER
+#ifdef MEAS__PERF_COUNTERS
 printf("Creating HW counters...");
 struct perf_event_attr hw_event;
+memset(&hw_event,0,sizeof(hw_event));
 	hw_event.type = PERF_TYPE_HARDWARE;
-	hw_event.size = sizeof(struct perf_event_attr);
+	hw_event.size = sizeof(hw_event);
 	hw_event.disabled = 1;
+hw_event.freq = 0;
 	hw_event.inherit = 1; /* children inherit it   */
 	hw_event.pinned = 1; /* must always be on PMU */
 	hw_event.exclusive = 0; /* only group on PMU     */
 	hw_event.exclude_user = 0; /* don't count user      */
 	hw_event.exclude_kernel = 1; /* ditto kernel          */
 	hw_event.exclude_hv = 1; /* ditto hypervisor      */
 	hw_event.exclude_idle = 0; /* don't count when idle */
 	hw_event.mmap = 0; /* include mmap data     */
 	hw_event.comm = 0; /* include comm data     */
 for( coreIdx = 0; coreIdx < NUM_CORES; coreIdx++ )
 {
-	hw_event.config = PERF_COUNT_HW_CPU_CYCLES; //cycles
+	hw_event.config = 0x0000000000000000; //cycles
 _VMSMasterEnv->cycles_counter_fd[coreIdx] = syscall(__NR_perf_event_open, &hw_event,
 		0,//pid_t pid,
-		coreIdx,//int cpu,
+		-1,//int cpu,
 		-1,//int group_fd,
 		0//unsigned long flags
 	);
-hw_event.config = PERF_COUNT_HW_INSTRUCTIONS; //instrs
+if (_VMSMasterEnv->cycles_counter_fd[coreIdx]<0){
+fprintf(stderr,"On core %d: ",coreIdx);
+perror("Failed to open cycles counter");
+}
+hw_event.config = 0x0000000000000001; //instrs
 _VMSMasterEnv->instrs_counter_fd[coreIdx] = syscall(__NR_perf_event_open, &hw_event,
 		0,//pid_t pid,
-		coreIdx,//int cpu,
+		-1,//int cpu,
 		-1,//int group_fd,
 		0//unsigned long flags
 	);
+if (_VMSMasterEnv->instrs_counter_fd[coreIdx]<0){
+fprintf(stderr,"On core %d: ",coreIdx);
+perror("Failed to open instrs counter");
+}
 }
 prctl(PR_TASK_PERF_EVENTS_ENABLE);
+uint64 tmpc,tmpi;
+saveCyclesAndInstrs(0,tmpc,tmpi);
+printf("Start: cycles = %lu, instrs = %lu\n",tmpc,tmpi);
 #endif
 //========================================================================
 }
 * free the struc, while VMS knows how to get the newPr if it wants it, and
 * it lets the lang have lang-specific data related to creation transported
 * to the plugin.
 */
 void
-VMS__send_create_procr_req( void *semReqData, VirtProcr *reqstingPr )
+VMS__send_create_procr_req( void *semReqData, VirtProcr *reqstingPr ) __attribute__ ((noinline))
 { VMSReqst req;
 req.reqType          = createReq;
 req.semReqData       = semReqData;
 req.nextReqst        = reqstingPr->requests;
 * never returns from this call, but instead the virtual processor's trace
 * gets suspended in this call and all the virt processor's state disap-
 * pears -- making that suspend the last thing in the virt procr's trace.
 */
 void
-VMS__send_dissipate_req( VirtProcr *procrToDissipate )
+VMS__send_dissipate_req( VirtProcr *procrToDissipate ) __attribute__ ((noinline))
 { VMSReqst req;
 req.reqType                = dissipate;
 req.nextReqst              = procrToDissipate->requests;
 procrToDissipate->requests = &req;
 /*This inserts the semantic-layer's request data into standard VMS carrier
 * request data-struct is allocated on stack of this call & ptr to it sent
 * to plugin
 *Then it does suspend, to cause request to be sent.
 */
-inline void
+/*inline*/ void
-VMS__send_sem_request( void *semReqData, VirtProcr *callingPr )
+VMS__send_sem_request( void *semReqData, VirtProcr *callingPr ) __attribute__ ((noinline))
 { VMSReqst req;
 req.reqType         = semantic;
 req.semReqData      = semReqData;
 req.nextReqst       = callingPr->requests;
 VMS__suspend_procr( callingPr );
 }
-inline void
+/*inline*/ void
-VMS__send_VMSSem_request( void *semReqData, VirtProcr *callingPr )
+VMS__send_VMSSem_request( void *semReqData, VirtProcr *callingPr ) __attribute__ ((noinline))
 { VMSReqst req;
 req.reqType         = VMSSemantic;
 req.semReqData      = semReqData;
 req.nextReqst       = callingPr->requests; //gab any other preceeding
 for( coreIdx=0; coreIdx < NUM_CORES; coreIdx++ )
 {    //Note, this is running in the master
 shutDownPr = VMS__create_procr( &endOSThreadFn, NULL );
 writeVMSQ( shutDownPr, _VMSMasterEnv->readyToAnimateQs[coreIdx] );
 }
+#ifdef MEAS__PERF_COUNTERS
+uint64 tmpc,tmpi;
+saveCyclesAndInstrs(0,tmpc,tmpi);
+printf("End: cycles = %lu, instrs = %lu\n",tmpc,tmpi);
+prctl(PR_TASK_PERF_EVENTS_DISABLE);
+/*
+for( coreIdx=0; coreIdx < NUM_CORES; coreIdx++ ){
+close(_VMSMasterEnv->cycles_counter_fd[coreIdx]);
+close(_VMSMasterEnv->instrs_counter_fd[coreIdx]);
+}
+*/
+#endif
 }
 /*Am trying to be cute, avoiding IF statement in coreLoop that checks for
 * a special shutdown procr.  Ended up with extra-complex shutdown sequence.
 //int              coreIdx;
 //VirtProcr      **masterVPs;
 //SchedSlot     ***allSchedSlots; //ptr to array of ptrs
 //Before getting rid of everything, print out any measurements made
-forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&printHist );
+//forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&printHist );
-forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&saveHistToFile);
+//forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&saveHistToFile);
 //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHistExt );
 #ifdef MEAS__TIME_PLUGIN
 printHist( _VMSMasterEnv->reqHdlrLowTimeHist );
 saveHistToFile( _VMSMasterEnv->reqHdlrHighTimeHist );
 printHist( _VMSMasterEnv->reqHdlrHighTimeHist );

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

comparison VMS.c @ 109:659299627e70