From: mats c. <ma...@us...> - 2006-01-17 10:28:22
|
Update of /cvsroot/jungerl/jungerl/lib/prf/examples/gperf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6766/examples/gperf Modified Files: gperfGtk.erl gperfConsumer.erl ChangeLog Log Message: * gperfConsumer.erl (Module): cpu load now shows beam, user, kernel, io * gperfGtk.erl (Module): in blue,red,green,magenta Index: gperfConsumer.erl =================================================================== RCS file: /cvsroot/jungerl/jungerl/lib/prf/examples/gperf/gperfConsumer.erl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gperfConsumer.erl 1 Dec 2005 15:40:47 -0000 1.2 +++ gperfConsumer.erl 17 Jan 2006 10:28:07 -0000 1.3 @@ -58,10 +58,13 @@ end. load(Max,#data{sys=N},#data{sys=O}) -> - [sysload(N),beamload(Max,N,O)]. + [beamload(Max,N,O)|sysload(N)]. sysload(N) -> - (w(user,N)+w(kernel,N))/100. + U = w(user,N)/100, + K = w(kernel,N)/100, + W = w(wait,N)/100, + [U,U+K,U+K+W]. beamload(Max,N,O) -> case dv(w(runtime,N)-w(runtime,O),w(wall_clock,N)-w(wall_clock,O)) of @@ -82,7 +85,7 @@ max(1,dv(OutN-OutO,Max))]. net1([],In,Out) -> {In,Out}; -net1([{Nod,N}|X],I,O) -> +net1([{_Nod,N}|X],I,O) -> {In,Out} = net2(N,[],[]), net1(X,I+In,O+Out). @@ -98,7 +101,7 @@ _ -> 0 end. -dv(A,0) -> 0; +dv(_,0) -> 0; dv(A,B) -> A/B. max(R,V) when V < R -> V; Index: gperfGtk.erl =================================================================== RCS file: /cvsroot/jungerl/jungerl/lib/prf/examples/gperf/gperfGtk.erl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gperfGtk.erl 8 Dec 2005 16:25:29 -0000 1.2 +++ gperfGtk.erl 17 Jan 2006 10:28:07 -0000 1.3 @@ -19,7 +19,7 @@ -define(WXSIZE,200). -define(WYSIZE,?YSIZE). -define(XHALF,(?XSIZE div 2)). --define(DAREAS, [{drawingarea1,[blue,red]}, +-define(DAREAS, [{drawingarea1,[blue,red,green,magenta]}, {drawingarea2,[black,blue,red,yellow]}, {drawingarea3,[red,green]}]). Index: ChangeLog =================================================================== RCS file: /cvsroot/jungerl/jungerl/lib/prf/examples/gperf/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ChangeLog 16 Jan 2006 13:04:32 -0000 1.4 +++ ChangeLog 17 Jan 2006 10:28:07 -0000 1.5 @@ -1,3 +1,8 @@ +2006-01-17 Mats Cronqvist <locmacr@mwlx084> + + * gperfConsumer.erl (Module): cpu load now shows beam, user, kernel, io + * gperfGtk.erl (Module): in blue,red,green,magenta + 2006-01-16 Mats Cronqvist <locmacr@mwlx084> * gperf (Module): -dbg flag |