From owner-p4-projects@FreeBSD.ORG Mon Aug 30 06:26:09 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2041C10656B4; Mon, 30 Aug 2010 06:26:09 +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 C3B7510656AC for ; Mon, 30 Aug 2010 06:26:08 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 968658FC1C for ; Mon, 30 Aug 2010 06:26:08 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7U6Q8SD023918 for ; Mon, 30 Aug 2010 06:26:08 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7U6Q8Iv023915 for perforce@freebsd.org; Mon, 30 Aug 2010 06:26:08 GMT (envelope-from trasz@freebsd.org) Date: Mon, 30 Aug 2010 06:26:08 GMT Message-Id: <201008300626.o7U6Q8Iv023915@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Aug 2010 06:26:09 -0000 http://p4web.freebsd.org/@@183059?ac=10 Change 183059 by trasz@trasz_victim on 2010/08/30 06:26:01 Fix build. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#28 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#28 (text+ko) ==== @@ -58,16 +58,16 @@ static void container_sub(struct container *dest, const struct container *src); SDT_PROVIDER_DEFINE(container); -SDT_PROBE_DEFINE3(container, kernel, rusage, add, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, add_failure, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, set, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, set_failure, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE3(container, kernel, rusage, sub, "struct proc *", "int", "uint64_t"); -SDT_PROBE_DEFINE1(container, kernel, container, create, "struct container *"); -SDT_PROBE_DEFINE1(container, kernel, container, destroy, "struct container *"); -SDT_PROBE_DEFINE2(container, kernel, container, join, "struct container *", "struct container *"); -SDT_PROBE_DEFINE2(container, kernel, container, join_failure, "struct container *", "struct container *"); -SDT_PROBE_DEFINE2(container, kernel, container, leave, "struct container *", "struct container *"); +SDT_PROBE_DEFINE3(container, kernel, rusage, add, add, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(container, kernel, rusage, add_failure, add-failure, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(container, kernel, rusage, set, set, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(container, kernel, rusage, set_failure, set-failure, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE3(container, kernel, rusage, sub, sub, "struct proc *", "int", "uint64_t"); +SDT_PROBE_DEFINE1(container, kernel, container, create, create, "struct container *"); +SDT_PROBE_DEFINE1(container, kernel, container, destroy, destroy, "struct container *"); +SDT_PROBE_DEFINE2(container, kernel, container, join, join, "struct container *", "struct container *"); +SDT_PROBE_DEFINE2(container, kernel, container, join_failure, join-failure, "struct container *", "struct container *"); +SDT_PROBE_DEFINE2(container, kernel, container, leave, leave, "struct container *", "struct container *"); static int container_resource_reclaimable(int resource) @@ -578,6 +578,7 @@ */ rusage_set(p, RUSAGE_FSIZE, 0); rusage_set(p, RUSAGE_NPTS, 0); + rusage_set(p, RUSAGE_NTHR, 0); #ifdef HRL hrl_proc_exit(p);