SH-4153 Port user and system cpu accounting from example program.
The http_texture_load example program has some cpu usage gathering tools that should be generally useful and specifically for the deadman switch. Port these into llcommon into new all-static class LLProcInfo. Add unit test, etc.master
Monty Brandenberg
parent
7911f065cd
commit
7992564e06
|
|
@ -79,6 +79,7 @@ set(llcommon_SOURCE_FILES
|
|||
llptrto.cpp
|
||||
llprocess.cpp
|
||||
llprocessor.cpp
|
||||
llprocinfo.cpp
|
||||
llqueuedthread.cpp
|
||||
llrand.cpp
|
||||
llrefcount.cpp
|
||||
|
|
@ -207,6 +208,7 @@ set(llcommon_HEADER_FILES
|
|||
llpriqueuemap.h
|
||||
llprocess.h
|
||||
llprocessor.h
|
||||
llprocinfo.h
|
||||
llptrskiplist.h
|
||||
llptrskipmap.h
|
||||
llptrto.h
|
||||
|
|
@ -331,6 +333,7 @@ if (LL_TESTS)
|
|||
LL_ADD_INTEGRATION_TEST(llinstancetracker "" "${test_libs}")
|
||||
LL_ADD_INTEGRATION_TEST(lllazy "" "${test_libs}")
|
||||
LL_ADD_INTEGRATION_TEST(llprocessor "" "${test_libs}")
|
||||
LL_ADD_INTEGRATION_TEST(llprocinfo "" "${test_libs}")
|
||||
LL_ADD_INTEGRATION_TEST(llrand "" "${test_libs}")
|
||||
LL_ADD_INTEGRATION_TEST(llsdserialize "" "${test_libs}")
|
||||
LL_ADD_INTEGRATION_TEST(llsingleton "" "${test_libs}")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,94 @@
|
|||
/**
|
||||
* @file llprocinfo.cpp
|
||||
* @brief Process, cpu and resource usage information APIs.
|
||||
* @author monty@lindenlab.com
|
||||
*
|
||||
* $LicenseInfo:firstyear=2013&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2013, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
|
||||
#include "llprocinfo.h"
|
||||
|
||||
#if LL_WINDOWS
|
||||
|
||||
#define PSAPI_VERSION 1
|
||||
#include "windows.h"
|
||||
#include "psapi.h"
|
||||
|
||||
#elif LL_DARWIN
|
||||
|
||||
#include <sys/resource.h>
|
||||
#include <mach/mach.h>
|
||||
|
||||
#else
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
|
||||
#endif // LL_WINDOWS/LL_DARWIN
|
||||
|
||||
|
||||
// static
|
||||
void LLProcInfo::getCPUUsage(time_type & user_time, time_type & system_time)
|
||||
{
|
||||
#if LL_WINDOWS
|
||||
|
||||
HANDLE self(GetCurrentProcess()); // Does not have to be closed
|
||||
FILETIME ft_dummy, ft_system, ft_user;
|
||||
|
||||
GetProcessTimes(self, &ft_dummy, &ft_dummy, &ft_system, &ft_user);
|
||||
ULARGE_INTEGER uli;
|
||||
uli.u.LowPart = ft_system.dwLowDateTime;
|
||||
uli.u.HighPart = ft_system.dwHighDateTime;
|
||||
system_time = uli.QuadPart / U64L(10); // Convert to uS
|
||||
uli.u.LowPart = ft_user.dwLowDateTime;
|
||||
uli.u.HighPart = ft_user.dwHighDateTime;
|
||||
user_time = uli.QuadPart / U64L(10);
|
||||
|
||||
#elif LL_DARWIN
|
||||
|
||||
struct rusage usage;
|
||||
|
||||
if (getrusage(RUSAGE_SELF, &usage))
|
||||
{
|
||||
user_time = system_time = time_type(0U);
|
||||
return;
|
||||
}
|
||||
user_time = U64(usage.ru_utime.tv_sec) * U64L(1000000) + usage.ru_utime.tv_usec;
|
||||
system_time = U64(usage.ru_stime.tv_sec) * U64L(1000000) + usage.ru_stime.tv_usec;
|
||||
|
||||
#else // Linux
|
||||
|
||||
struct rusage usage;
|
||||
|
||||
if (getrusage(RUSAGE_SELF, &usage))
|
||||
{
|
||||
user_time = system_time = time_type(0U);
|
||||
return;
|
||||
}
|
||||
user_time = U64(usage.ru_utime.tv_sec) * U64L(1000000) + usage.ru_utime.tv_usec;
|
||||
system_time = U64(usage.ru_stime.tv_sec) * U64L(1000000) + usage.ru_stime.tv_usec;
|
||||
|
||||
#endif // LL_WINDOWS/LL_DARWIN/Linux
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
/**
|
||||
* @file llprocinfo.h
|
||||
* @brief Interface to process/cpu/resource information services.
|
||||
* @author monty@lindenlab.com
|
||||
*
|
||||
* $LicenseInfo:firstyear=2013&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2013, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_PROCINFO_H
|
||||
#define LL_PROCINFO_H
|
||||
|
||||
|
||||
#include "linden_common.h"
|
||||
|
||||
/// @file llprocinfo.h
|
||||
///
|
||||
/// Right now, this is really a namespace disguised as a class.
|
||||
/// It wraps some types and functions to return information about
|
||||
/// process resource consumption in a non-OS-specific manner.
|
||||
///
|
||||
/// Threading: No instances so that's thread-safe. Implementations
|
||||
/// of static functions should be thread-safe, they mostly involve
|
||||
/// direct syscall invocations.
|
||||
///
|
||||
/// Allocation: Not instantiatable.
|
||||
|
||||
class LL_COMMON_API LLProcInfo
|
||||
{
|
||||
public:
|
||||
/// Public types
|
||||
|
||||
typedef U64 time_type; /// Relative microseconds
|
||||
|
||||
private:
|
||||
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);
|
||||
};
|
||||
|
||||
|
||||
#endif // LL_PROCINFO_H
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
/**
|
||||
* @file llprocinfo_test.cpp
|
||||
* @brief Tests for the LLProcInfo class.
|
||||
*
|
||||
* $LicenseInfo:firstyear=2013&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2013, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#include "linden_common.h"
|
||||
|
||||
#include "../llprocinfo.h"
|
||||
|
||||
#include "../test/lltut.h"
|
||||
#include "../lltimer.h"
|
||||
|
||||
|
||||
static const LLProcInfo::time_type bad_user(289375U), bad_system(275U);
|
||||
|
||||
|
||||
namespace tut
|
||||
{
|
||||
|
||||
struct procinfo_test
|
||||
{
|
||||
procinfo_test()
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
typedef test_group<procinfo_test> procinfo_group_t;
|
||||
typedef procinfo_group_t::object procinfo_object_t;
|
||||
tut::procinfo_group_t procinfo_instance("LLProcInfo");
|
||||
|
||||
|
||||
// Basic invocation works
|
||||
template<> template<>
|
||||
void procinfo_object_t::test<1>()
|
||||
{
|
||||
LLProcInfo::time_type user(bad_user), system(bad_system);
|
||||
|
||||
set_test_name("getCPUUsage() basic function");
|
||||
|
||||
LLProcInfo::getCPUUsage(user, system);
|
||||
|
||||
ensure_not_equals("getCPUUsage() writes to its user argument", user, bad_user);
|
||||
ensure_not_equals("getCPUUsage() writes to its system argument", system, bad_system);
|
||||
}
|
||||
|
||||
|
||||
// Time increases
|
||||
template<> template<>
|
||||
void procinfo_object_t::test<2>()
|
||||
{
|
||||
LLProcInfo::time_type user(bad_user), system(bad_system);
|
||||
LLProcInfo::time_type user2(bad_user), system2(bad_system);
|
||||
|
||||
set_test_name("getCPUUsage() increases over time");
|
||||
|
||||
LLProcInfo::getCPUUsage(user, system);
|
||||
|
||||
for (int i(0); i < 100000; ++i)
|
||||
{
|
||||
ms_sleep(0);
|
||||
}
|
||||
|
||||
LLProcInfo::getCPUUsage(user2, system2);
|
||||
|
||||
ensure_equals("getCPUUsage() user value increases over time", user2 > user, true);
|
||||
ensure_equals("getCPUUsage() system value increases over time", system2 > system, true);
|
||||
}
|
||||
|
||||
|
||||
} // end namespace tut
|
||||
Loading…
Reference in New Issue