@@ -987,12 +987,14 @@ int AdminModel::getPidsFromProcName(const std::regex& procNameRegEx, std::vector
987987
988988int AdminModel::getAssignedKitPids (std::vector<int > *pids)
989989{
990- return getPidsFromProcName (std::regex (" kitbroker_.*" ), pids);
990+ static const std::regex re (" kitbroker_.*" );
991+ return getPidsFromProcName (re, pids);
991992}
992993
993994int AdminModel::getUnassignedKitPids (std::vector<int > *pids)
994995{
995- return getPidsFromProcName (std::regex (" kit_spare_.*" ), pids);
996+ static const std::regex re (" kit_spare_.*" );
997+ return getPidsFromProcName (re, pids);
996998}
997999
9981000void AdminModel::getKitPidsFromSystem (std::vector<int > *pids)
@@ -1200,7 +1202,10 @@ void AdminModel::getMetrics(std::ostream& oss) const
12001202{
12011203 ASSERT_CORRECT_THREAD_OWNER (_owner);
12021204
1203- oss << " coolwsd_count " << getPidsFromProcName (std::regex (" coolwsd" ), nullptr ) << ' \n ' ;
1205+ static const std::regex coolwsdRe (" coolwsd" );
1206+ static const std::regex forkitRe (" forkit" );
1207+
1208+ oss << " coolwsd_count " << getPidsFromProcName (coolwsdRe, nullptr ) << ' \n ' ;
12041209 oss << " coolwsd_thread_count " << ProcUtil::getStatFromPid (ProcUtil::getProcessId (), 19 )
12051210 << ' \n ' ;
12061211 oss << " coolwsd_cpu_time_seconds "
@@ -1210,7 +1215,7 @@ void AdminModel::getMetrics(std::ostream& oss) const
12101215 oss << " coolwsd_tcp_connections_used " << StreamSocket::getExternalConnectionCount () << ' \n ' ;
12111216 oss << ' \n ' ;
12121217
1213- oss << " forkit_count " << getPidsFromProcName (std::regex ( " forkit " ) , nullptr ) << ' \n ' ;
1218+ oss << " forkit_count " << getPidsFromProcName (forkitRe , nullptr ) << ' \n ' ;
12141219 oss << " forkit_thread_count " << ProcUtil::getStatFromPid (_forKitPid, 19 ) << ' \n ' ;
12151220 oss << " forkit_cpu_time_seconds " << ProcUtil::getCpuUsage (_forKitPid) / sysconf (_SC_CLK_TCK) << ' \n ' ;
12161221 oss << " forkit_memory_used_bytes " << ProcUtil::getMemoryUsageRSS (_forKitPid) * 1024 << ' \n ' ;
0 commit comments