diff --git a/LSL2/STPROC/OENGINE_SERVICES.txt b/LSL2/STPROC/OENGINE_SERVICES.txt index 22265ad..ca8cdbb 100644 --- a/LSL2/STPROC/OENGINE_SERVICES.txt +++ b/LSL2/STPROC/OENGINE_SERVICES.txt @@ -25,14 +25,8 @@ $Insert APP_INSERTS $Insert SERVICE_SETUP $Insert REVDOTNETEQUATES -Declare Function Environment_Services, Logging_Services, GetCurrentProcessId, GetCommandLine -Declare Subroutine Logging_Services, Set_Property.Net - -LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\OEngine' -LogDate = Oconv(Date(), 'D4/') -LogTime = Oconv(Time(), 'MTS') -Headers = 'Logging DTM' : @FM : 'Memory - Working Set' : @FM : 'Memory - Peak Working Set' -LoggingDTM = LogDate : ' ' : LogTime +Declare Function GetCurrentProcessId, GetCommandLine +Declare Subroutine Set_Property.Net, Mona_Services GoToService else Error_Services('Set', Service : ' is not a valid service request within the ' : ServiceModule : ' services module.') @@ -46,14 +40,13 @@ Return Response or "" Service LogMemoryUsage() - CmdLine = GetCommandLine() - EngIndex = Index(CmdLine, '/S=', 1) - EngNo = CmdLine[EngIndex + 3, 'F '] - LogFileName = LogDate[7, 4] : '-' : LogDate[1, 2] : '-' : LogDate[4, 2] : ' ' : EngNo : ' OEngine Log.csv' - objLog = Logging_Services('NewLog', LogPath, LogFileName, CRLF$, ',', Headers, '', False$, False$) - - ErrCode = '' - Pid = GetCurrentProcessId() + CmdLine = GetCommandLine() + EngIndex = Index(CmdLine, '/S=', 1) + EngNo = CmdLine[EngIndex + 3, 'F '] + BaseGroupResource = 'GRP_OPENINSIGHT_MES_OP_FE_ENGINES_' + MonaResource = BaseGroupResource:EngNo + ErrCode = '' + Pid = GetCurrentProcessId() If Pid NE '' then DotNetHandle = StartDotNet("","4.0") DotNetDir = CheckDotNet('4.0'):'\' @@ -62,16 +55,14 @@ Service LogMemoryUsage() If Not(Get_Status(errCode)) then objProc = Create_Class.Net(DotNetHandle, "System.Diagnostics.Process", False$) If Not(Get_status(errCode)) then - Methods = get_info.net(objProc, REVDOTNET_INFO_METHODS) + Methods = Get_Info.Net(objProc, REVDOTNET_INFO_METHODS) objThisProc = Send_Message.Net(objProc, "GetProcessById", Pid, 'System.Int32', True$) If Not(Get_Status(errCode)) then // Log memory values PeakWorkingSet = Get_Property.Net(objThisProc, 'PeakWorkingSet64', False$) / 1024 WorkingSet = Get_Property.Net(objThisProc, 'WorkingSet64', False$) / 1024 - LogData = LoggingDtm - LogData<2> = WorkingSet:' KB' - LogData<3> = PeakWorkingSet:' KB' - Logging_Services('AppendLog', objLog, LogData, @RM, @FM) + Mona_Services('PostAverageMetric', MonaResource, 'PeakMemoryUsage', PeakWorkingSet) + Mona_Services('PostAverageMetric', MonaResource, 'CurrentMemoryUsage', WorkingSet) Free_Class.Net(objThisProc) end Free_Class.Net(objProc) @@ -81,5 +72,3 @@ Service LogMemoryUsage() End Service - -