diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
| commit | bccc10db9a90d365c353baebf443fde2030ce970 (patch) | |
| tree | 2c2e1fd94b29667a809f8d7285d049f5ff5d424d /indra/llcommon/llprocinfo.h | |
| parent | 531cd34f670170ade57f8813fe48012b61a1d3c2 (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into marchcat/x-b-merge
# Conflicts:
# autobuild.xml
# indra/cmake/ConfigurePkgConfig.cmake
# indra/cmake/ICU4C.cmake
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
# indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/lloutfitslist.cpp
Diffstat (limited to 'indra/llcommon/llprocinfo.h')
| -rw-r--r-- | indra/llcommon/llprocinfo.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/indra/llcommon/llprocinfo.h b/indra/llcommon/llprocinfo.h index e78bcf490a..5955799812 100644 --- a/indra/llcommon/llprocinfo.h +++ b/indra/llcommon/llprocinfo.h @@ -1,4 +1,4 @@ -/** +/** * @file llprocinfo.h * @brief Interface to process/cpu/resource information services. * @author monty@lindenlab.com @@ -25,8 +25,8 @@ * $/LicenseInfo$ */ -#ifndef LL_PROCINFO_H -#define LL_PROCINFO_H +#ifndef LL_PROCINFO_H +#define LL_PROCINFO_H #include "linden_common.h" @@ -46,23 +46,23 @@ class LL_COMMON_API LLProcInfo { public: - /// Public types + /// Public types + + typedef U64 time_type; /// Relative microseconds - typedef U64 time_type; /// Relative microseconds - private: - LLProcInfo(); // Not defined - ~LLProcInfo(); // Not defined - LLProcInfo(const LLProcInfo &); // Not defined - void operator=(const LLProcInfo &); // Not defined + LLProcInfo(); // Not defined + ~LLProcInfo(); // Not defined + LLProcInfo(const LLProcInfo &); // Not defined + void operator=(const LLProcInfo &); // Not defined public: - /// Get accumulated system and user CPU time in - /// microseconds. Syscalls involved in every invocation. - /// - /// Threading: expected to be safe. - static void getCPUUsage(time_type & user_time, time_type & system_time); + /// Get accumulated system and user CPU time in + /// microseconds. Syscalls involved in every invocation. + /// + /// Threading: expected to be safe. + static void getCPUUsage(time_type & user_time, time_type & system_time); }; - -#endif // LL_PROCINFO_H + +#endif // LL_PROCINFO_H |