Update of /var/cvs/html/mmbase/components/core
In directory james.mmbase.org:/tmp/cvs-serv25116
Modified Files:
job.jspf jobs.jspx
Log Message:
made a bit nicer
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/core
Index: job.jspf
===================================================================
RCS file: /var/cvs/html/mmbase/components/core/job.jspf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- job.jspf 9 Jul 2008 17:44:49 -0000 1.3
+++ job.jspf 1 Aug 2008 21:38:36 -0000 1.4
@@ -1,20 +1,27 @@
-<td><jsp:expression>executor.getActiveCount()</jsp:expression ></td>
-<td><jsp:expression>executor.getCompletedTaskCount()</jsp:expression ></td>
-<td><jsp:expression>executor.getPoolSize()</jsp:expression>
+<tr><th>#Active</th><th>#Completed</th><th>Pool size</th><th
colspan="2">Queue</th></tr>
+<tr><th colspan="3"></th><th>Job</th><th>due in</th></tr>
+<c:set var="rowspan"><jsp:expression>Math.max(1,
executor.getQueue().size())</jsp:expression></c:set>
+<tr>
+<td
rowspan="${rowspan}"><jsp:expression>executor.getActiveCount()</jsp:expression
></td>
+<td
rowspan="${rowspan}"><jsp:expression>executor.getCompletedTaskCount()</jsp:expression
></td>
+<td
rowspan="${rowspan}"><jsp:expression>executor.getPoolSize()</jsp:expression>
<jsp:scriptlet>if (executor.getMaximumPoolSize() != Integer.MAX_VALUE)
{</jsp:scriptlet>
/
<jsp:expression>executor.getMaximumPoolSize()</jsp:expression>
<jsp:scriptlet>}</jsp:scriptlet>
</td>
-<td>
- <jsp:scriptlet>for (Runnable runnable : executor.getQueue()) {
ScheduledFuture future = (ScheduledFuture) runnable;</jsp:scriptlet>
- <p title="<jsp:expression>future</jsp:expression>">
- <jsp:expression>future.hashCode()</jsp:expression>
- : due in
+ <jsp:scriptlet>for (Runnable runnable : executor.getQueue()) {
+ ScheduledFuture future = (ScheduledFuture) runnable;</jsp:scriptlet>
+ <td>
+ <jsp:expression>ThreadPools.getString(future)</jsp:expression>
+ </td>
+ <td>
<jsp:expression>future.getDelay(TimeUnit.HOURS)</jsp:expression>h
<jsp:expression>future.getDelay(TimeUnit.MINUTES) % 60</jsp:expression>min
- <jsp:expression>future.getDelay(TimeUnit.SECONDS) % 60</jsp:expression>s
- </p>
+ <jsp:expression>future.getDelay(TimeUnit.SECONDS) %
+ 60</jsp:expression>s
+ </td>
+ </tr><tr>
<jsp:scriptlet>}</jsp:scriptlet>
-</td>
+</tr>
Index: jobs.jspx
===================================================================
RCS file: /var/cvs/html/mmbase/components/core/jobs.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- jobs.jspx 10 Jul 2008 16:13:19 -0000 1.3
+++ jobs.jspx 1 Aug 2008 21:38:36 -0000 1.4
@@ -12,27 +12,22 @@
<div
class="mm_c c_core b_jobs ${requestScope.className}"
id="${requestScope.componentId}">
+ <p>
+ This is an overview of the several ThreadPools which are used in MMBase,
and which are collected
+ <a
href="http://www.mmbase.org/mm/multiproject/mmbase/xref/org/mmbase/util/ThreadPools.html";>in
org.mmbase.util.ThreadPools</a>
+ </p>
<p><em><mm:time time="now" format=":FULL.FULL" /></em> - <mm:cloudinfo
type="user" /></p>
<table summary="Jobs statistics" border="0" cellspacing="0"
cellpadding="3">
<caption>Jobs statistics</caption>
- <tr>
- <th>Executor</th><th>#Active</th><th>#Completed</th><th>Pool
size</th><th>Queue</th>
- </tr>
- <tr>
- <th>Scheduler</th>
+ <tr><th colspan="5">Scheduler</th></tr>
<jsp:scriptlet>ThreadPoolExecutor executor = (ThreadPoolExecutor)
ThreadPools.scheduler;</jsp:scriptlet>
<jsp:directive.include file="job.jspf" />
- </tr>
- <tr>
- <th>Filters</th>
+ <tr><th colspan="5">Filters</th></tr>
<jsp:scriptlet>executor = (ThreadPoolExecutor)
ThreadPools.filterExecutor;</jsp:scriptlet>
<jsp:directive.include file="job.jspf" />
- </tr>
- <tr>
- <th>Jobs</th>
+ <tr><th colspan="5">Jobs</th></tr>
<jsp:scriptlet>executor = (ThreadPoolExecutor)
ThreadPools.jobsExecutor;</jsp:scriptlet>
<jsp:directive.include file="job.jspf" />
- </tr>
</table>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
