Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* AboutSystem now shows cache usage together with total/available mem.

Browse Source 
* Small cleanups.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24788 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2008-04-04 00:40:42 +00:00
parent 6b0feadc93
commit ddd25e757b
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/apps/aboutsystem/AboutSystem.cpp
View File

@ -1,9 +1,10 @@
/* /*
* Copyright (c) 2005-2007, Haiku, Inc. * Copyright (c) 2005-2008, Haiku, Inc.
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
* *
* Author: * Authors:
* DarkWyrm <bpmagic@columbus.rr.com> * DarkWyrm <bpmagic@columbus.rr.com>
* René Gollent
*/ */
@ -43,7 +44,8 @@
static const char *UptimeToString(char string[], size_t size); static const char *UptimeToString(char string[], size_t size);
static const char *MemUsageToString(char string[], size_t size); static const char *MemUsageToString(char string[], size_t size, system_info *info);
static const char *CacheUsageToString(char string[], size_t size, system_info *info);
static const rgb_color kDarkGrey = { 100, 100, 100, 255 }; static const rgb_color kDarkGrey = { 100, 100, 100, 255 };
static const rgb_color kHaikuGreen = { 42, 131, 36, 255 }; static const rgb_color kHaikuGreen = { 42, 131, 36, 255 };
@ -81,6 +83,7 @@ class AboutView : public BView {
private: private:
BStringView *fMemView; BStringView *fMemView;
BStringView *fCacheView;
BStringView *fUptimeView; BStringView *fUptimeView;
BView *fInfoView; BView *fInfoView;
BTextView *fCreditsView; BTextView *fCreditsView;
@ -235,7 +238,6 @@ AboutView::AboutView(const BRect &rect)
fInfoView->AddChild(stringView); fInfoView->AddChild(stringView);
stringView->ResizeToPreferred(); stringView->ResizeToPreferred();
BString cpuType; BString cpuType;
cpuType << get_cpu_vendor_string(systemInfo.cpu_type) cpuType << get_cpu_vendor_string(systemInfo.cpu_type)
<< " " << get_cpu_model_string(&systemInfo); << " " << get_cpu_model_string(&systemInfo);
@ -272,9 +274,14 @@ AboutView::AboutView(const BRect &rect)
fMemView = new BStringView(r, "ramtext", ""); fMemView = new BStringView(r, "ramtext", "");
fInfoView->AddChild(fMemView); fInfoView->AddChild(fMemView);
//fMemView->ResizeToPreferred(); fMemView->SetText(MemUsageToString(string, sizeof(string), &systemInfo));
fMemView->SetText(MemUsageToString(string, sizeof(string))); r.OffsetBy(0, textHeight);
r.bottom = r.top + textHeight;
fCacheView = new BStringView(r, "cachetext", "");
fInfoView->AddChild(fCacheView);
fCacheView->SetText(CacheUsageToString(string, sizeof(string), &systemInfo));
// Kernel build time/date // Kernel build time/date
r.OffsetBy(0, textHeight * 1.5); r.OffsetBy(0, textHeight * 1.5);
@ -658,9 +665,11 @@ void
AboutView::Pulse(void) AboutView::Pulse(void)
{ {
char string[255]; char string[255];
system_info info;
get_system_info(&info);
fUptimeView->SetText(UptimeToString(string, sizeof(string))); fUptimeView->SetText(UptimeToString(string, sizeof(string)));
fMemView->SetText(MemUsageToString(string, sizeof(string))); fMemView->SetText(MemUsageToString(string, sizeof(string), &info));
fCacheView->SetText(CacheUsageToString(string, sizeof(string), &info));
if (fScrollRunner == NULL && (system_time() > fLastActionTime + 10000000)) { if (fScrollRunner == NULL && (system_time() > fLastActionTime + 10000000)) {
BMessage message(SCROLL_CREDITS_VIEW); BMessage message(SCROLL_CREDITS_VIEW);
@ -823,21 +832,23 @@ AboutView::PickRandomHaiku()
static const char * static const char *
MemUsageToString(char string[], size_t size) MemUsageToString(char string[], size_t size, system_info *info)
{ {
system_info systemInfo;
if (get_system_info(&systemInfo) < B_OK)
return "Unknown";
snprintf(string, size, "%d MB total, %d MB used (%d%%)", snprintf(string, size, "%d MB total, %d MB used (%d%%)",
int(systemInfo.max_pages / 256.0f + 0.5f), int(info->max_pages / 256.0f + 0.5f),
int(systemInfo.used_pages / 256.0f + 0.5f), int(info->used_pages / 256.0f + 0.5f),
int(100 * systemInfo.used_pages / systemInfo.max_pages)); int(100 * info->used_pages / info->max_pages));
return string; return string;
} }
static const char *
CacheUsageToString(char string[], size_t size, system_info *info)
{
snprintf(string, size, "Cache size: %d MB", int(info->cached_pages / 256.0f + 0.5f));
return string;
}
static const char * static const char *
UptimeToString(char string[], size_t size) UptimeToString(char string[], size_t size)