From owner-svn-src-user@FreeBSD.ORG Mon Jan 18 01:52:38 2010 Return-Path: <owner-svn-src-user@FreeBSD.ORG> Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C35A7106566B; Mon, 18 Jan 2010 01:52:38 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B2B158FC1F; Mon, 18 Jan 2010 01:52:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0I1qc7p011499; Mon, 18 Jan 2010 01:52:38 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0I1qc6d011497; Mon, 18 Jan 2010 01:52:38 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201001180152.o0I1qc6d011497@svn.freebsd.org> From: Kip Macy <kmacy@FreeBSD.org> Date: Mon, 18 Jan 2010 01:52:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202539 - user/kmacy/releng_8_rump/lib/libunet/unet_sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Jan 2010 01:52:38 -0000 Author: kmacy Date: Mon Jan 18 01:52:38 2010 New Revision: 202539 URL: http://svn.freebsd.org/changeset/base/202539 Log: - enable verbosity - sysinit set is allocated in the text and thus not writeable copy to newly allocated memory before sorting Modified: user/kmacy/releng_8_rump/lib/libunet/unet_sys/unet_init_main.c Modified: user/kmacy/releng_8_rump/lib/libunet/unet_sys/unet_init_main.c ============================================================================== --- user/kmacy/releng_8_rump/lib/libunet/unet_sys/unet_init_main.c Mon Jan 18 01:50:53 2010 (r202538) +++ user/kmacy/releng_8_rump/lib/libunet/unet_sys/unet_init_main.c Mon Jan 18 01:52:38 2010 (r202539) @@ -102,6 +102,10 @@ SYSCTL_INT(_debug, OID_AUTO, boothowto, int bootverbose; SYSCTL_INT(_debug, OID_AUTO, bootverbose, CTLFLAG_RW, &bootverbose, 0, ""); #endif + +#define VERBOSE_SYSINIT + + /* * This ensures that there is at least one entry so that the sysinit_set * symbol is not undefined. A sybsystem ID of SI_SUB_DUMMY is never @@ -152,6 +156,7 @@ sysinit_add(struct sysinit **set, struct newsysinit_end = newset + count; } + /* * System startup; initialize the world, create process 0, mount root * filesystem, and fork to create init and pagedaemon. Most of the @@ -170,15 +175,22 @@ mi_startup(void) register struct sysinit **sipp; /* system initialization*/ register struct sysinit **xipp; /* interior loop of sort*/ register struct sysinit *save; /* bubble*/ + struct sysinit **temp; + int size; #if defined(VERBOSE_SYSINIT) int last; int verbose; #endif - if (sysinit == NULL) { + if (sysinit == NULL) { sysinit = SET_BEGIN(sysinit_set); sysinit_end = SET_LIMIT(sysinit_set); + size = (uintptr_t)sysinit_end - (uintptr_t)sysinit; + temp = malloc(size, M_DEVBUF, M_WAITOK); + memcpy(temp, sysinit, size); + sysinit = temp; + sysinit_end = (struct sysinit **)(((uint8_t *)sysinit) + size); } restart: