From 256a8fb5c5b708fbc9679b5a525799f4e0a87f20 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Sat, 13 Feb 2010 20:12:15 +0000 Subject: [PATCH] added: calculation of load averages and requests per second (uptime function shows it) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@577 e52654a7-88a9-db11-a3e9-0013d4bc506e --- content/Makefile.dep | 39 +++++------ core/Makefile.dep | 53 ++++++++------- core/Makefile.o.dep | 2 +- core/data.h | 4 ++ core/requestcontroller.cpp | 2 + html/fun_uptime.html | 4 +- locale/en | 3 +- locale/pl | 3 +- main/Makefile.dep | 10 +-- templates/Makefile.dep | 126 ++++++++++++++++++----------------- templates/templates.cpp | 9 ++- templates/templates.h | 9 ++- templates/winix.cpp | 72 ++++++++++++++++++++ templatesnotify/Makefile.dep | 2 +- 14 files changed, 223 insertions(+), 115 deletions(-) diff --git a/content/Makefile.dep b/content/Makefile.dep index 72ba6e0..6cc68e8 100755 --- a/content/Makefile.dep +++ b/content/Makefile.dep @@ -28,8 +28,8 @@ content.o: ../core/db.h ../core/group.h ../core/dircontainer.h content.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h content.o: ../core/users.h ../core/groups.h ../core/functions.h content.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -content.o: ../core/locale.h ../core/misc.h ../core/plugin.h ../core/request.h -content.o: ../core/data.h ../core/pluginmsg.h +content.o: ../core/locale.h ../core/loadavg.h ../core/misc.h ../core/plugin.h +content.o: ../core/request.h ../core/data.h ../core/pluginmsg.h createthread.o: content.h ../core/item.h ../templates/templates.h createthread.o: ../templates/patterncacher.h ../templates/misc.h createthread.o: ../templates/localefilter.h ../core/locale.h @@ -46,7 +46,7 @@ createthread.o: ../core/db.h ../core/group.h ../core/dircontainer.h createthread.o: ../core/ugcontainer.h ../core/mount.h ../core/data.h createthread.o: ../core/dirs.h ../core/users.h ../core/groups.h createthread.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -createthread.o: ../core/mount.h ../core/locale.h +createthread.o: ../core/mount.h ../core/locale.h ../core/loadavg.h createticket.o: content.h ../core/item.h ../templates/templates.h createticket.o: ../templates/patterncacher.h ../templates/misc.h createticket.o: ../templates/localefilter.h ../core/locale.h @@ -63,7 +63,7 @@ createticket.o: ../core/db.h ../core/group.h ../core/dircontainer.h createticket.o: ../core/ugcontainer.h ../core/mount.h ../core/data.h createticket.o: ../core/dirs.h ../core/users.h ../core/groups.h createticket.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -createticket.o: ../core/mount.h ../core/locale.h +createticket.o: ../core/mount.h ../core/locale.h ../core/loadavg.h default.o: content.h ../core/item.h ../templates/templates.h default.o: ../templates/patterncacher.h ../templates/misc.h default.o: ../templates/localefilter.h ../core/locale.h @@ -80,7 +80,7 @@ default.o: ../core/db.h ../core/group.h ../core/dircontainer.h default.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h default.o: ../core/users.h ../core/groups.h ../core/functions.h default.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -default.o: ../core/locale.h +default.o: ../core/locale.h ../core/loadavg.h editticket.o: content.h ../core/item.h ../templates/templates.h editticket.o: ../templates/patterncacher.h ../templates/misc.h editticket.o: ../templates/localefilter.h ../core/locale.h @@ -97,7 +97,7 @@ editticket.o: ../core/db.h ../core/group.h ../core/dircontainer.h editticket.o: ../core/ugcontainer.h ../core/mount.h ../core/data.h editticket.o: ../core/dirs.h ../core/users.h ../core/groups.h editticket.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -editticket.o: ../core/mount.h ../core/locale.h +editticket.o: ../core/mount.h ../core/locale.h ../core/loadavg.h emacs.o: content.h ../core/item.h ../templates/templates.h emacs.o: ../templates/patterncacher.h ../templates/misc.h emacs.o: ../templates/localefilter.h ../core/locale.h @@ -113,9 +113,9 @@ emacs.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h emacs.o: ../core/db.h ../core/group.h ../core/dircontainer.h emacs.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h ../core/users.h emacs.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h -emacs.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/notify.h -emacs.o: ../templatesnotify/templatesnotify.h ../core/mount.h -emacs.o: ../templates/misc.h ../core/misc.h +emacs.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/loadavg.h +emacs.o: ../core/notify.h ../templatesnotify/templatesnotify.h +emacs.o: ../core/mount.h ../templates/misc.h ../core/misc.h last.o: content.h ../core/item.h ../templates/templates.h last.o: ../templates/patterncacher.h ../templates/misc.h last.o: ../templates/localefilter.h ../core/locale.h @@ -137,7 +137,7 @@ login.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h login.o: ../core/db.h ../core/group.h ../core/dircontainer.h login.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h ../core/users.h login.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h -login.o: ../core/mounts.h ../core/mount.h ../core/locale.h +login.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/loadavg.h logout.o: content.h ../core/item.h ../templates/templates.h logout.o: ../templates/patterncacher.h ../templates/misc.h logout.o: ../templates/localefilter.h ../core/locale.h @@ -153,7 +153,7 @@ logout.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h logout.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h logout.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h logout.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -logout.o: ../core/mount.h ../core/locale.h +logout.o: ../core/mount.h ../core/locale.h ../core/loadavg.h ls.o: content.h ../core/item.h ../templates/templates.h ls.o: ../templates/patterncacher.h ../templates/misc.h ls.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h @@ -198,6 +198,7 @@ misc_specialfile.o: ../core/dircontainer.h ../core/users.h misc_specialfile.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h misc_specialfile.o: ../core/functions.h ../core/lastcontainer.h misc_specialfile.o: ../core/mounts.h ../core/mount.h ../core/locale.h +misc_specialfile.o: ../core/loadavg.h mkdir.o: content.h ../core/item.h ../templates/templates.h mkdir.o: ../templates/patterncacher.h ../templates/misc.h mkdir.o: ../templates/localefilter.h ../core/locale.h @@ -213,9 +214,9 @@ mkdir.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h mkdir.o: ../core/db.h ../core/group.h ../core/dircontainer.h mkdir.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h ../core/users.h mkdir.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h -mkdir.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/notify.h -mkdir.o: ../templatesnotify/templatesnotify.h ../core/mount.h -mkdir.o: ../templates/misc.h +mkdir.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/loadavg.h +mkdir.o: ../core/notify.h ../templatesnotify/templatesnotify.h +mkdir.o: ../core/mount.h ../templates/misc.h node.o: content.h ../core/item.h ../templates/templates.h node.o: ../templates/patterncacher.h ../templates/misc.h node.o: ../templates/localefilter.h ../core/locale.h @@ -243,7 +244,7 @@ priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h priv.o: ../core/db.h ../core/group.h ../core/dircontainer.h priv.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h ../core/users.h priv.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h -priv.o: ../core/mounts.h ../core/mount.h ../core/locale.h +priv.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/loadavg.h reload.o: content.h ../core/item.h ../templates/templates.h reload.o: ../templates/patterncacher.h ../templates/misc.h reload.o: ../templates/localefilter.h ../core/locale.h @@ -272,7 +273,7 @@ rm.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h ../core/db.h rm.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h rm.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h rm.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -rm.o: ../core/mount.h ../core/locale.h +rm.o: ../core/mount.h ../core/locale.h ../core/loadavg.h run.o: content.h ../core/item.h ../templates/templates.h run.o: ../templates/patterncacher.h ../templates/misc.h run.o: ../templates/localefilter.h ../core/locale.h @@ -300,7 +301,7 @@ thread.o: ../core/postmultiparser.h ../core/ticket.h ../core/db.h thread.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h thread.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h thread.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -thread.o: ../core/mount.h ../core/locale.h ../core/mount.h +thread.o: ../core/mount.h ../core/locale.h ../core/loadavg.h ../core/mount.h ticket.o: content.h ../core/item.h ../templates/templates.h ticket.o: ../templates/patterncacher.h ../templates/misc.h ticket.o: ../templates/localefilter.h ../core/locale.h @@ -316,7 +317,7 @@ ticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/db.h ticket.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h ticket.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h ticket.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -ticket.o: ../core/mount.h ../core/locale.h ../core/mount.h +ticket.o: ../core/mount.h ../core/locale.h ../core/loadavg.h ../core/mount.h upload.o: content.h ../core/item.h ../templates/templates.h upload.o: ../templates/patterncacher.h ../templates/misc.h upload.o: ../templates/localefilter.h ../core/locale.h @@ -332,7 +333,7 @@ upload.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h upload.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h upload.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h upload.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -upload.o: ../core/mount.h ../core/locale.h +upload.o: ../core/mount.h ../core/locale.h ../core/loadavg.h ../core/misc.h who.o: content.h ../core/item.h ../templates/templates.h who.o: ../templates/patterncacher.h ../templates/misc.h who.o: ../templates/localefilter.h ../core/locale.h diff --git a/core/Makefile.dep b/core/Makefile.dep index b5c126d..ba69364 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -5,12 +5,14 @@ compress.o: compress.h log.h config.o: config.h ../confparser/confparser.h log.h data.h dirs.h item.h config.o: dircontainer.h users.h user.h ugcontainer.h groups.h group.h config.o: functions.h function.h lastcontainer.h mounts.h mount.h error.h -config.o: rebus.h locale.h plugin.h request.h requesttypes.h session.h done.h -config.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h -config.o: htmlfilter.h postmultiparser.h ticket.h pluginmsg.h misc.h +config.o: rebus.h locale.h loadavg.h plugin.h request.h requesttypes.h +config.o: session.h done.h thread.h compress.h acceptencodingparser.h +config.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h +config.o: pluginmsg.h misc.h data.o: data.h dirs.h item.h dircontainer.h users.h user.h ugcontainer.h data.o: log.h groups.h group.h functions.h function.h lastcontainer.h data.o: mounts.h mount.h error.h rebus.h locale.h ../confparser/confparser.h +data.o: loadavg.h db.o: db.h item.h user.h group.h thread.h error.h log.h dircontainer.h db.o: ugcontainer.h ticket.h misc.h db_itemcolumns.o: db.h item.h user.h group.h thread.h error.h log.h @@ -19,7 +21,7 @@ dircontainer.o: dircontainer.h item.h log.h dirs.o: dirs.h item.h dircontainer.h error.h log.h db.h user.h group.h dirs.o: thread.h ugcontainer.h ticket.h data.h users.h groups.h functions.h dirs.o: function.h lastcontainer.h mounts.h mount.h rebus.h locale.h -dirs.o: ../confparser/confparser.h +dirs.o: ../confparser/confparser.h loadavg.h done.o: done.h error.o: error.h log.h function.o: function.h item.h @@ -27,31 +29,33 @@ functioncodeparser.o: functioncodeparser.h item.h function.h log.h functionparser.o: functionparser.h requesttypes.h log.h item.h error.h data.h functionparser.o: dirs.h dircontainer.h users.h user.h ugcontainer.h groups.h functionparser.o: group.h functions.h function.h lastcontainer.h mounts.h -functionparser.o: mount.h rebus.h locale.h ../confparser/confparser.h db.h -functionparser.o: thread.h ticket.h request.h session.h done.h compress.h -functionparser.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h -functionparser.o: postmultiparser.h +functionparser.o: mount.h rebus.h locale.h ../confparser/confparser.h +functionparser.o: loadavg.h db.h thread.h ticket.h request.h session.h done.h +functionparser.o: compress.h acceptencodingparser.h acceptbaseparser.h +functionparser.o: htmlfilter.h postmultiparser.h functions.o: functions.h function.h item.h groups.o: groups.h group.h ugcontainer.h log.h db.h item.h user.h thread.h groups.o: error.h dircontainer.h ticket.h htmlfilter.o: htmlfilter.h httpsimpleparser.o: httpsimpleparser.h lastcontainer.o: lastcontainer.h log.h +loadavg.o: loadavg.h log.h locale.o: locale.h ../confparser/confparser.h log.h log.o: log.h misc.o: misc.h item.h log.h data.h dirs.h dircontainer.h users.h user.h misc.o: ugcontainer.h groups.h group.h functions.h function.h lastcontainer.h misc.o: mounts.h mount.h error.h rebus.h locale.h ../confparser/confparser.h +misc.o: loadavg.h mount.o: mount.h mountparser.o: mountparser.h mount.h item.h error.h log.h data.h dirs.h mountparser.o: dircontainer.h users.h user.h ugcontainer.h groups.h group.h mountparser.o: functions.h function.h lastcontainer.h mounts.h rebus.h -mountparser.o: locale.h ../confparser/confparser.h misc.h +mountparser.o: locale.h ../confparser/confparser.h loadavg.h misc.h mounts.o: mounts.h mount.h error.h log.h data.h dirs.h item.h dircontainer.h mounts.o: users.h user.h ugcontainer.h groups.h group.h functions.h mounts.o: function.h lastcontainer.h rebus.h locale.h -mounts.o: ../confparser/confparser.h request.h requesttypes.h session.h -mounts.o: done.h thread.h compress.h acceptencodingparser.h +mounts.o: ../confparser/confparser.h loadavg.h request.h requesttypes.h +mounts.o: session.h done.h thread.h compress.h acceptencodingparser.h mounts.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h mounts.o: mountparser.h db.h notify.o: log.h notify.h ../templatesnotify/templatesnotify.h ../core/mount.h @@ -59,20 +63,20 @@ notify.o: ../core/locale.h ../confparser/confparser.h ../templates/misc.h notify.o: ../templates/localefilter.h data.h dirs.h item.h dircontainer.h notify.o: users.h user.h ugcontainer.h groups.h group.h functions.h notify.o: function.h lastcontainer.h mounts.h mount.h error.h rebus.h -notify.o: locale.h misc.h request.h requesttypes.h session.h done.h thread.h -notify.o: compress.h acceptencodingparser.h acceptbaseparser.h htmlfilter.h -notify.o: postmultiparser.h ticket.h +notify.o: locale.h loadavg.h misc.h request.h requesttypes.h session.h done.h +notify.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h +notify.o: htmlfilter.h postmultiparser.h ticket.h plugin.o: plugin.h request.h requesttypes.h session.h done.h item.h error.h plugin.o: log.h user.h rebus.h function.h thread.h compress.h plugin.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h plugin.o: postmultiparser.h ticket.h data.h dirs.h dircontainer.h users.h plugin.o: ugcontainer.h groups.h group.h functions.h lastcontainer.h mounts.h -plugin.o: mount.h locale.h ../confparser/confparser.h pluginmsg.h +plugin.o: mount.h locale.h ../confparser/confparser.h loadavg.h pluginmsg.h postmultiparser.o: postmultiparser.h error.h log.h requesttypes.h data.h postmultiparser.o: dirs.h item.h dircontainer.h users.h user.h ugcontainer.h postmultiparser.o: groups.h group.h functions.h function.h lastcontainer.h postmultiparser.o: mounts.h mount.h rebus.h locale.h -postmultiparser.o: ../confparser/confparser.h +postmultiparser.o: ../confparser/confparser.h loadavg.h rebus.o: log.h rebus.h misc.h item.h request.o: request.h requesttypes.h session.h done.h item.h error.h log.h request.o: user.h rebus.h function.h thread.h compress.h @@ -80,8 +84,8 @@ request.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h request.o: postmultiparser.h ticket.h getparser.h httpsimpleparser.h request.o: postparser.h cookieparser.h data.h dirs.h dircontainer.h users.h request.o: ugcontainer.h groups.h group.h functions.h lastcontainer.h -request.o: mounts.h mount.h locale.h ../confparser/confparser.h plugin.h -request.o: pluginmsg.h misc.h db.h +request.o: mounts.h mount.h locale.h ../confparser/confparser.h loadavg.h +request.o: plugin.h pluginmsg.h misc.h db.h requestcontroller.o: requestcontroller.h ../content/content.h ../core/item.h requestcontroller.o: ../templates/templates.h ../templates/patterncacher.h requestcontroller.o: misc.h item.h ../templates/ckeditorgetparser.h @@ -92,9 +96,9 @@ requestcontroller.o: error.h log.h user.h rebus.h functionparser.h requestcontroller.o: requesttypes.h data.h dirs.h dircontainer.h users.h requestcontroller.o: ugcontainer.h groups.h group.h functions.h function.h requestcontroller.o: lastcontainer.h mounts.h mount.h locale.h -requestcontroller.o: ../confparser/confparser.h request.h thread.h compress.h -requestcontroller.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h -requestcontroller.o: postmultiparser.h ticket.h postparser.h +requestcontroller.o: ../confparser/confparser.h loadavg.h request.h thread.h +requestcontroller.o: compress.h acceptencodingparser.h acceptbaseparser.h +requestcontroller.o: htmlfilter.h postmultiparser.h ticket.h postparser.h requestcontroller.o: httpsimpleparser.h cookieparser.h notify.h requestcontroller.o: ../templatesnotify/templatesnotify.h ../core/mount.h requestcontroller.o: ../core/locale.h ../templates/misc.h @@ -104,18 +108,19 @@ sessioncontainer.o: sessioncontainer.h session.h done.h item.h error.h log.h sessioncontainer.o: user.h rebus.h data.h dirs.h dircontainer.h users.h sessioncontainer.o: ugcontainer.h groups.h group.h functions.h function.h sessioncontainer.o: lastcontainer.h mounts.h mount.h locale.h -sessioncontainer.o: ../confparser/confparser.h +sessioncontainer.o: ../confparser/confparser.h loadavg.h sessionmanager.o: sessionmanager.h sessioncontainer.h session.h done.h item.h sessionmanager.o: error.h log.h user.h rebus.h request.h requesttypes.h sessionmanager.o: function.h thread.h compress.h acceptencodingparser.h sessionmanager.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h sessionmanager.o: data.h dirs.h dircontainer.h users.h ugcontainer.h groups.h sessionmanager.o: group.h functions.h lastcontainer.h mounts.h mount.h -sessionmanager.o: locale.h ../confparser/confparser.h sessionparser.h +sessionmanager.o: locale.h ../confparser/confparser.h loadavg.h +sessionmanager.o: sessionparser.h sessionparser.o: sessionparser.h session.h done.h item.h error.h log.h user.h sessionparser.o: rebus.h sessioncontainer.h data.h dirs.h dircontainer.h sessionparser.o: users.h ugcontainer.h groups.h group.h functions.h sessionparser.o: function.h lastcontainer.h mounts.h mount.h locale.h -sessionparser.o: ../confparser/confparser.h +sessionparser.o: ../confparser/confparser.h loadavg.h users.o: users.h user.h ugcontainer.h log.h db.h item.h group.h thread.h users.o: error.h dircontainer.h ticket.h diff --git a/core/Makefile.o.dep b/core/Makefile.o.dep index 669d5c4..77be37b 100755 --- a/core/Makefile.o.dep +++ b/core/Makefile.o.dep @@ -1 +1 @@ -o = acceptbaseparser.o compress.o config.o data.o db.o db_itemcolumns.o dircontainer.o dirs.o done.o error.o function.o functioncodeparser.o functionparser.o functions.o groups.o htmlfilter.o httpsimpleparser.o lastcontainer.o locale.o log.o misc.o mount.o mountparser.o mounts.o notify.o plugin.o postmultiparser.o rebus.o request.o requestcontroller.o session.o sessioncontainer.o sessionmanager.o sessionparser.o users.o +o = acceptbaseparser.o compress.o config.o data.o db.o db_itemcolumns.o dircontainer.o dirs.o done.o error.o function.o functioncodeparser.o functionparser.o functions.o groups.o htmlfilter.o httpsimpleparser.o lastcontainer.o loadavg.o locale.o log.o misc.o mount.o mountparser.o mounts.o notify.o plugin.o postmultiparser.o rebus.o request.o requestcontroller.o session.o sessioncontainer.o sessionmanager.o sessionparser.o users.o diff --git a/core/data.h b/core/data.h index d5abd40..7998586 100755 --- a/core/data.h +++ b/core/data.h @@ -23,6 +23,7 @@ #include "mounts.h" #include "rebus.h" #include "locale.h" +#include "loadavg.h" class Data @@ -197,6 +198,9 @@ public: // how many logged users long how_many_logged; + // load averages + LoadAvg load_avg; + Data(); diff --git a/core/requestcontroller.cpp b/core/requestcontroller.cpp index 8e415ff..c132a69 100755 --- a/core/requestcontroller.cpp +++ b/core/requestcontroller.cpp @@ -182,6 +182,7 @@ void RequestController::Loop() { while( FCGX_Accept(&request.in, &request.out, &request.err, &request.env) == 0 ) { + data.load_avg.StartRequest(); log << log2 << "---------------------------------------------------------------------------------" << logend; try @@ -232,6 +233,7 @@ void RequestController::Loop() } request.ClearPostFileTmp(); + data.load_avg.StopRequest(); log << logsave; } } diff --git a/html/fun_uptime.html b/html/fun_uptime.html index ebca5d9..4ec596f 100755 --- a/html/fun_uptime.html +++ b/html/fun_uptime.html @@ -10,7 +10,9 @@ [end]
-{uptime_users}: [winix_users_logged] +{uptime_users}: [winix_users_logged]
+{load_avg}: [winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]
+{req_per_sec}: [winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]

diff --git a/locale/en b/locale/en index a21e8c7..ed80d57 100755 --- a/locale/en +++ b/locale/en @@ -15,7 +15,8 @@ home_page = Home page button_login = Login - +load_avg = load averages +req_per_sec = Requests per second added_by = Added by last_modified = Last modified diff --git a/locale/pl b/locale/pl index 0a9ed03..7c238b4 100755 --- a/locale/pl +++ b/locale/pl @@ -15,7 +15,8 @@ home_page = Strona g button_login = Loguj - +load_avg = średnie obciążenie +req_per_sec = Wywołań na sekundę added_by = Dodane przez last_modified = ostatnio modyfikowany diff --git a/main/Makefile.dep b/main/Makefile.dep index 1bd594d..4262846 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -12,11 +12,11 @@ main.o: ../core/rebus.h ../core/functionparser.h ../core/requesttypes.h main.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h ../core/users.h main.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h main.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h -main.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/request.h -main.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h -main.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -main.o: ../core/postmultiparser.h ../core/ticket.h ../core/db.h -main.o: ../core/config.h ../core/notify.h +main.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/loadavg.h +main.o: ../core/request.h ../core/thread.h ../core/compress.h +main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +main.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +main.o: ../core/db.h ../core/config.h ../core/notify.h main.o: ../templatesnotify/templatesnotify.h ../core/mount.h main.o: ../templates/misc.h ../core/plugin.h ../core/request.h ../core/data.h main.o: ../core/pluginmsg.h diff --git a/templates/Makefile.dep b/templates/Makefile.dep index d65402f..f7d09c3 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -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 diff --git a/templates/templates.cpp b/templates/templates.cpp index 33a64f6..b0b6d36 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -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); diff --git a/templates/templates.h b/templates/templates.h index ca6ce6f..96e48d1 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -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 diff --git a/templates/winix.cpp b/templates/winix.cpp index 9a31b9b..ccd2623 100755 --- a/templates/winix.cpp +++ b/templates/winix.cpp @@ -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 diff --git a/templatesnotify/Makefile.dep b/templatesnotify/Makefile.dep index b4f468c..5e590f6 100755 --- a/templatesnotify/Makefile.dep +++ b/templatesnotify/Makefile.dep @@ -13,4 +13,4 @@ templatesnotify.o: ../core/log.h ../core/groups.h ../core/group.h templatesnotify.o: ../core/functions.h ../core/function.h templatesnotify.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h templatesnotify.o: ../core/error.h ../core/rebus.h ../core/locale.h -templatesnotify.o: ../core/log.h +templatesnotify.o: ../core/loadavg.h ../core/log.h