tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: calculation of load averages and requests per second

Browse Source 
(uptime function shows it)


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@577 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-02-13 20:12:15 +00:00
parent 3c5a7cd664
commit 256a8fb5c5
14 changed files with 223 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
templates/Makefile.dep
View File

@@ -11,7 +11,8 @@ dir.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
dir.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h ../core/users.h
dir.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
dir.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
dir.o: ../core/mount.h ../core/locale.h ../core/db.h ../core/misc.h
dir.o: ../core/mount.h ../core/locale.h ../core/loadavg.h ../core/db.h
dir.o: ../core/misc.h
doc.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
doc.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
doc.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h ../core/dirs.h
@@ -19,11 +20,11 @@ doc.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h
doc.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
doc.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
doc.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
doc.o: ../core/locale.h ../core/request.h ../core/requesttypes.h
doc.o: ../core/session.h ../core/done.h ../core/thread.h ../core/compress.h
doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
doc.o: ../core/misc.h
doc.o: ../core/locale.h ../core/loadavg.h ../core/request.h
doc.o: ../core/requesttypes.h ../core/session.h ../core/done.h
doc.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
doc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
doc.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
done.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
done.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
done.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
@@ -40,11 +41,12 @@ item.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
item.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
item.o: ../core/group.h ../core/functions.h ../core/function.h
item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
item.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/request.h
item.o: ../core/requesttypes.h ../core/session.h ../core/done.h
item.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
item.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
item.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
item.o: ../core/done.h ../core/thread.h ../core/compress.h
item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
item.o: ../core/misc.h
last.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
last.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
last.o: ../core/httpsimpleparser.h ../core/log.h ../core/lastcontainer.h
@@ -53,8 +55,8 @@ last.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
last.o: ../core/groups.h ../core/group.h ../core/functions.h
last.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
last.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
last.o: ../core/done.h ../core/thread.h ../core/compress.h
last.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
last.o: ../core/session.h ../core/done.h ../core/thread.h ../core/compress.h
last.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
last.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
last.o: ../core/misc.h
@@ -73,8 +75,8 @@ misc.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
misc.o: ../core/groups.h ../core/group.h ../core/functions.h
misc.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
misc.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
misc.o: ../core/misc.h misc.h localefilter.h ../core/locale.h
misc.o: ../confparser/confparser.h
misc.o: ../core/loadavg.h ../core/misc.h misc.h localefilter.h
misc.o: ../core/locale.h ../confparser/confparser.h
mount.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
mount.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
mount.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -82,14 +84,14 @@ mount.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
mount.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
mount.o: ../core/group.h ../core/functions.h ../core/function.h
mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
mount.o: ../core/error.h ../core/rebus.h ../core/locale.h
mount.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
patterncacher.o: patterncacher.h ../core/item.h ../core/data.h ../core/dirs.h
patterncacher.o: ../core/item.h ../core/dircontainer.h ../core/users.h
patterncacher.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
patterncacher.o: ../core/groups.h ../core/group.h ../core/functions.h
patterncacher.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
patterncacher.o: ../core/mount.h ../core/error.h ../core/rebus.h
patterncacher.o: ../core/locale.h ../core/log.h
patterncacher.o: ../core/locale.h ../core/loadavg.h ../core/log.h
priv.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
priv.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
priv.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -97,11 +99,12 @@ priv.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
priv.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
priv.o: ../core/group.h ../core/functions.h ../core/function.h
priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
priv.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/request.h
priv.o: ../core/requesttypes.h ../core/session.h ../core/done.h
priv.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
priv.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
priv.o: ../core/done.h ../core/thread.h ../core/compress.h
priv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
priv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
priv.o: ../core/misc.h
rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h
rebus.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h
rebus.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h
@@ -111,9 +114,9 @@ rebus.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h
rebus.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h
rebus.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
rebus.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
rebus.o: ../core/mount.h ../core/locale.h templates.h patterncacher.h
rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h
rebus.o: ../confparser/confparser.h ckeditorgetparser.h
rebus.o: ../core/mount.h ../core/locale.h ../core/loadavg.h templates.h
rebus.o: patterncacher.h ../core/item.h misc.h localefilter.h
rebus.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h
sys.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
sys.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
@@ -122,11 +125,11 @@ sys.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h
sys.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
sys.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
sys.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
sys.o: ../core/locale.h ../core/request.h ../core/requesttypes.h
sys.o: ../core/session.h ../core/done.h ../core/thread.h ../core/compress.h
sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
sys.o: ../core/misc.h
sys.o: ../core/locale.h ../core/loadavg.h ../core/request.h
sys.o: ../core/requesttypes.h ../core/session.h ../core/done.h
sys.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
sys.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
sys.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
templates.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
templates.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
templates.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -135,12 +138,12 @@ templates.o: ../core/users.h ../core/user.h ../core/ugcontainer.h
templates.o: ../core/log.h ../core/groups.h ../core/group.h
templates.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
templates.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
templates.o: ../core/locale.h ../core/request.h ../core/requesttypes.h
templates.o: ../core/session.h ../core/done.h ../core/thread.h
templates.o: ../core/compress.h ../core/acceptencodingparser.h
templates.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
templates.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
templates.o: ../core/plugin.h ../core/request.h ../core/data.h
templates.o: ../core/locale.h ../core/loadavg.h ../core/request.h
templates.o: ../core/requesttypes.h ../core/session.h ../core/done.h
templates.o: ../core/thread.h ../core/compress.h
templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
templates.o: ../core/misc.h ../core/plugin.h ../core/request.h ../core/data.h
templates.o: ../core/pluginmsg.h
thread.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
thread.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
@@ -150,11 +153,11 @@ thread.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
thread.o: ../core/groups.h ../core/group.h ../core/functions.h
thread.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
thread.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
thread.o: ../core/done.h ../core/thread.h ../core/compress.h
thread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
thread.o: ../core/misc.h
thread.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
thread.o: ../core/session.h ../core/done.h ../core/thread.h
thread.o: ../core/compress.h ../core/acceptencodingparser.h
thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
thread.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
ticket.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
ticket.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
ticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -163,11 +166,11 @@ ticket.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
ticket.o: ../core/groups.h ../core/group.h ../core/functions.h
ticket.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
ticket.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
ticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h
ticket.o: ../core/done.h ../core/thread.h ../core/compress.h
ticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
ticket.o: ../core/misc.h
ticket.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
ticket.o: ../core/session.h ../core/done.h ../core/thread.h
ticket.o: ../core/compress.h ../core/acceptencodingparser.h
ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
ticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
uptime.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
uptime.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
uptime.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -176,6 +179,7 @@ uptime.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
uptime.o: ../core/groups.h ../core/group.h ../core/functions.h
uptime.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
uptime.o: ../core/loadavg.h
user.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
user.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
user.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -183,11 +187,12 @@ user.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
user.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
user.o: ../core/group.h ../core/functions.h ../core/function.h
user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
user.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/request.h
user.o: ../core/requesttypes.h ../core/session.h ../core/done.h
user.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
user.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
user.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
user.o: ../core/done.h ../core/thread.h ../core/compress.h
user.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
user.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
user.o: ../core/misc.h
who.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
who.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
who.o: ../core/httpsimpleparser.h ../core/log.h ../core/sessioncontainer.h
@@ -200,10 +205,11 @@ who.o: ../core/functionparser.h ../core/requesttypes.h ../core/data.h
who.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h
who.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
who.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
who.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/request.h
who.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
who.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
who.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
who.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/loadavg.h
who.o: ../core/request.h ../core/thread.h ../core/compress.h
who.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
who.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
who.o: ../core/misc.h
winix.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
winix.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
winix.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -211,8 +217,8 @@ winix.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
winix.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
winix.o: ../core/group.h ../core/functions.h ../core/function.h
winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
winix.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/request.h
winix.o: ../core/requesttypes.h ../core/session.h ../core/done.h
winix.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
winix.o: ../core/postmultiparser.h ../core/ticket.h
winix.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h
winix.o: ../core/done.h ../core/thread.h ../core/compress.h
winix.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
winix.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h

9
templates/templates.cpp
View File

@@ -450,7 +450,14 @@ void Templates::CreateFunctions()
functions.Insert("winix_users_logged", winix_users_logged);
functions.Insert("winix_function_is", winix_function_is);
functions.Insert("winix_function_param_is", winix_function_param_is);
functions.Insert("winix_loadavg_now", winix_loadavg_now);
functions.Insert("winix_loadavg_1", winix_loadavg_1);
functions.Insert("winix_loadavg_5", winix_loadavg_5);
functions.Insert("winix_loadavg_15", winix_loadavg_15);
functions.Insert("winix_req_per_sec_now", winix_req_per_sec_now);
functions.Insert("winix_req_per_sec_1", winix_req_per_sec_1);
functions.Insert("winix_req_per_sec_5", winix_req_per_sec_5);
functions.Insert("winix_req_per_sec_15", winix_req_per_sec_15);

9
templates/templates.h
View File

@@ -358,7 +358,14 @@ namespace TemplatesFunctions
void winix_users_logged(Info & i);
void winix_function_is(Info & i);
void winix_function_param_is(Info & i);
void winix_loadavg_now(Info & i);
void winix_loadavg_1(Info & i);
void winix_loadavg_5(Info & i);
void winix_loadavg_15(Info & i);
void winix_req_per_sec_now(Info & i);
void winix_req_per_sec_1(Info & i);
void winix_req_per_sec_5(Info & i);
void winix_req_per_sec_15(Info & i);
} // namespace TemplatesFunctions

72
templates/winix.cpp
View File

@@ -57,4 +57,76 @@ void winix_function_param_is(Info & i)
void winix_loadavg_now(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.LoadAvgNow());
i.out << buf;
}
void winix_loadavg_1(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.LoadAvg1());
i.out << buf;
}
void winix_loadavg_5(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.LoadAvg5());
i.out << buf;
}
void winix_loadavg_15(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.LoadAvg15());
i.out << buf;
}
void winix_req_per_sec_now(Info & i)
{
char buf[20];
sprintf(buf, "%.1f", (double)data.load_avg.ReqPerSecNow());
i.out << buf;
}
void winix_req_per_sec_1(Info & i)
{
char buf[20];
sprintf(buf, "%.1f", (double)data.load_avg.ReqPerSec1());
i.out << buf;
}
void winix_req_per_sec_5(Info & i)
{
char buf[20];
sprintf(buf, "%.1f", (double)data.load_avg.ReqPerSec5());
i.out << buf;
}
void winix_req_per_sec_15(Info & i)
{
char buf[20];
sprintf(buf, "%.1f", (double)data.load_avg.ReqPerSec15());
i.out << buf;
}
} // namespace