diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 30 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/llversionviewer.h | 6 |
2 files changed, 18 insertions, 18 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 37733cf9ad..d781687175 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -992,7 +992,7 @@ LLSD LLMemoryInfo::loadStatsMap() stats.add("PrivateUsage KB", pmem.PrivateUsage/1024); #elif LL_DARWIN - + const vm_size_t pagekb(vm_page_size / 1024); // @@ -1002,9 +1002,9 @@ LLSD LLMemoryInfo::loadStatsMap() { vm_statistics_data_t vmstat; mach_msg_type_number_t vmstatCount = HOST_VM_INFO_COUNT; - + if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t) &vmstat, &vmstatCount) != KERN_SUCCESS) - { + { LL_WARNS("LLMemoryInfo") << "Unable to collect memory information" << LL_ENDL; } else @@ -1035,17 +1035,17 @@ LLSD LLMemoryInfo::loadStatsMap() // // Collect the misc task info // - - { + + { task_events_info_data_t taskinfo; unsigned taskinfoSize = sizeof(taskinfo); if (task_info(mach_task_self(), TASK_EVENTS_INFO, (task_info_t) &taskinfo, &taskinfoSize) != KERN_SUCCESS) - { + { LL_WARNS("LLMemoryInfo") << "Unable to collect task information" << LL_ENDL; - } - else - { + } + else + { stats.add("Task page-ins", taskinfo.pageins); stats.add("Task copy-on-write faults", taskinfo.cow_faults); stats.add("Task messages sent", taskinfo.messages_sent); @@ -1053,23 +1053,23 @@ LLSD LLMemoryInfo::loadStatsMap() stats.add("Task mach system call count", taskinfo.syscalls_mach); stats.add("Task unix system call count", taskinfo.syscalls_unix); stats.add("Task context switch count", taskinfo.csw); - } + } } // // Collect the basic task info // - { + { task_basic_info_64_data_t taskinfo; unsigned taskinfoSize = sizeof(taskinfo); if (task_info(mach_task_self(), TASK_BASIC_INFO_64, (task_info_t) &taskinfo, &taskinfoSize) != KERN_SUCCESS) - { + { LL_WARNS("LLMemoryInfo") << "Unable to collect task information" << LL_ENDL; - } - else - { + } + else + { stats.add("Basic suspend count", taskinfo.suspend_count); stats.add("Basic virtual memory KB", taskinfo.virtual_size / 1024); stats.add("Basic resident memory KB", taskinfo.resident_size / 1024); diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 99c5412ae5..27b1bce60c 100644..100755 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -27,9 +27,9 @@ #ifndef LL_LLVERSIONVIEWER_H #define LL_LLVERSIONVIEWER_H -const S32 LL_VERSION_MAJOR = 2; -const S32 LL_VERSION_MINOR = 8; -const S32 LL_VERSION_PATCH = 4; +const S32 LL_VERSION_MAJOR = 3; +const S32 LL_VERSION_MINOR = 0; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |