From owner-p4-projects@FreeBSD.ORG Fri Jan 4 05:11:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFE3316A468; Fri, 4 Jan 2008 05:11:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C3F416A420 for ; Fri, 4 Jan 2008 05:11:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C11013C447 for ; Fri, 4 Jan 2008 05:11:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m045BRZF024745 for ; Fri, 4 Jan 2008 05:11:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m045BR0l024742 for perforce@freebsd.org; Fri, 4 Jan 2008 05:11:27 GMT (envelope-from jb@freebsd.org) Date: Fri, 4 Jan 2008 05:11:27 GMT Message-Id: <200801040511.m045BR0l024742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2008 05:11:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132458 Change 132458 by jb@jb_freebsd1 on 2008/01/04 05:10:56 Add another test to add a few cyclic to cause the arrays to be expanded and the old arrays to be freed. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/cyclic_test.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/kern/cyclic_test.c#4 (text+ko) ==== @@ -143,6 +143,71 @@ printf("%s: %s\n",__func__, error == 0 ? "passed":"failed"); } +static struct timespec test_003_start; + +static void +cyclic_test_003_func(void *arg) +{ + struct timespec ts; + + nanotime(&ts); + timespecsub(&ts,&test_003_start); + printf("%s: called after %lu.%09lu on curcpu %d id %ju\n",__func__,(u_long) ts.tv_sec,(u_long) ts.tv_nsec, curcpu, (uintmax_t) arg); +} + +static void +cyclic_test_003(void) +{ + int error = 0; + cyc_handler_t hdlr; + cyc_time_t when; + cyclic_id_t id; + cyclic_id_t id1; + cyclic_id_t id2; + cyclic_id_t id3; + + printf("%s: starting\n",__func__); + + hdlr.cyh_func = (cyc_func_t) cyclic_test_003_func; + + when.cyt_when = 0; + + nanotime(&test_003_start); + + mutex_enter(&cpu_lock); + + when.cyt_interval = 200000000; + hdlr.cyh_arg = (void *) 0UL; + id = cyclic_add(&hdlr, &when); + + when.cyt_interval = 400000000; + hdlr.cyh_arg = (void *) 1UL; + id1 = cyclic_add(&hdlr, &when); + + hdlr.cyh_arg = (void *) 2UL; + when.cyt_interval = 1000000000; + id2 = cyclic_add(&hdlr, &when); + + hdlr.cyh_arg = (void *) 3UL; + when.cyt_interval = 1300000000; + id3 = cyclic_add(&hdlr, &when); + + mutex_exit(&cpu_lock); + + DELAY(1200000); + + mutex_enter(&cpu_lock); + + cyclic_remove(id); + cyclic_remove(id1); + cyclic_remove(id2); + cyclic_remove(id3); + + mutex_exit(&cpu_lock); + + printf("%s: %s\n",__func__, error == 0 ? "passed":"failed"); +} + /* Kernel thread command routine. */ static void cyclic_run_tests(void *arg) @@ -156,9 +221,13 @@ case 2: cyclic_test_002(); break; + case 3: + cyclic_test_003(); + break; default: cyclic_test_001(); cyclic_test_002(); + cyclic_test_003(); break; }