From owner-p4-projects@FreeBSD.ORG  Tue Oct 12 17:17:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2493716A4D1; Tue, 12 Oct 2004 17:17:00 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E900716A4CE
	for <perforce@freebsd.org>; Tue, 12 Oct 2004 17:16:59 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DC86B43D4C
	for <perforce@freebsd.org>; Tue, 12 Oct 2004 17:16:59 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CHGxbF028249
	for <perforce@freebsd.org>; Tue, 12 Oct 2004 17:16:59 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CHGxmX028246
	for perforce@freebsd.org; Tue, 12 Oct 2004 17:16:59 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 12 Oct 2004 17:16:59 GMT
Message-Id: <200410121716.i9CHGxmX028246@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 63077 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Oct 2004 17:17:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=63077

Change 63077 by jhb@jhb_twclab on 2004/10/12 17:16:25

	Merge in a patch to whine if a task takes a long time to run.
	
	Submitted by:	rwatson

Affected files ...

.. //depot/projects/smpng/sys/kern/subr_taskqueue.c#22 edit
.. //depot/projects/smpng/sys/sys/_task.h#4 edit

Differences ...

==== //depot/projects/smpng/sys/kern/subr_taskqueue.c#22 (text+ko) ====

@@ -36,9 +36,16 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
+#include <sys/sysctl.h>
 #include <sys/taskqueue.h>
+#include <sys/time.h>
 #include <sys/unistd.h>
 
+int tq_in;
+SYSCTL_INT(_kern, OID_AUTO, tq_in, CTLFLAG_RD, &tq_in, 0, "");
+int tq_out;
+SYSCTL_INT(_kern, OID_AUTO, tq_out, CTLFLAG_RD, &tq_out, 0, "");
+
 static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues");
 static void	*taskqueue_giant_ih;
 static void	*taskqueue_ih;
@@ -140,6 +147,9 @@
 		return 0;
 	}
 
+	getnanotime(&task->ta_queuetime);
+	tq_in++;
+
 	/*
 	 * Optimise the case when all tasks have the same priority.
 	 */
@@ -172,6 +182,7 @@
 taskqueue_run(struct taskqueue *queue)
 {
 	struct task *task;
+	struct timespec tv;
 	int owned, pending;
 
 	owned = mtx_owned(&queue->tq_mutex);
@@ -187,7 +198,15 @@
 		pending = task->ta_pending;
 		task->ta_pending = 0;
 		task->ta_flags |= TAF_PENDING;
+ 		tq_out++;
+ 		getnanotime(&tv);
+ 		timespecsub(&tv, &task->ta_queuetime);
 		mtx_unlock(&queue->tq_mutex);
+ 		if (tv.tv_nsec >= 0500000000) {
+ 			printf("taskqueue_run: warning, queue time of %d.%09ld "
+ 			    "for context %p\n", tv.tv_sec, tv.tv_nsec,
+ 			    task->ta_func);
+ 		}
 
 		task->ta_func(task->ta_context, pending);
 

==== //depot/projects/smpng/sys/sys/_task.h#4 (text+ko) ====

@@ -46,6 +46,7 @@
 	task_fn_t *ta_func;		/* task handler */
 	void	*ta_context;		/* argument for handler */
 	int	ta_flags;		/* Flags */
+ 	struct timespec ta_queuetime;	/* time enqueued */
 };
 
 #define TAF_PENDING	0x1		/* Task is being run now */