Revision: 53197 http://trac.macports.org/changeset/53197 Author: jmr@macports.org Date: 2009-06-30 22:04:01 -0700 (Tue, 30 Jun 2009) Log Message: ----------- add a sysctl command to pextlib, and use it in portbuild Modified Paths: -------------- trunk/base/src/pextlib1.0/Makefile trunk/base/src/pextlib1.0/Pextlib.c trunk/base/src/port1.0/portbuild.tcl Added Paths: ----------- trunk/base/src/pextlib1.0/sysctl.c trunk/base/src/pextlib1.0/sysctl.h Modified: trunk/base/src/pextlib1.0/Makefile =================================================================== --- trunk/base/src/pextlib1.0/Makefile 2009-07-01 03:53:03 UTC (rev 53196) +++ trunk/base/src/pextlib1.0/Makefile 2009-07-01 05:04:01 UTC (rev 53197) @@ -1,7 +1,8 @@ OBJS= Pextlib.o strsed.o fgetln.o md5cmd.o setmode.o xinstall.o \ fs-traverse.o strcasecmp.o vercomp.o filemap.o \ sha1cmd.o curl.o rmd160cmd.o readline.o uid.o\ - tracelib.o tty.o get_systemconfiguration_proxies.o + tracelib.o tty.o get_systemconfiguration_proxies.o\ + sysctl.o SHLIB_NAME= Pextlib${SHLIB_SUFFIX} INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0 Modified: trunk/base/src/pextlib1.0/Pextlib.c =================================================================== --- trunk/base/src/pextlib1.0/Pextlib.c 2009-07-01 03:53:03 UTC (rev 53196) +++ trunk/base/src/pextlib1.0/Pextlib.c 2009-07-01 05:04:01 UTC (rev 53197) @@ -113,6 +113,7 @@ #include "tracelib.h" #include "tty.h" #include "get_systemconfiguration_proxies.h" +#include "sysctl.h" #if HAVE_CRT_EXTERNS_H #include <crt_externs.h> @@ -1151,6 +1152,7 @@ Tcl_CreateObjCommand(interp, "symlink", CreateSymlinkCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "unsetenv", UnsetEnvCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "lchown", lchownCmd, NULL, NULL); + Tcl_CreateObjCommand(interp, "sysctl", SysctlCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "readline", ReadlineCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "rl_history", RLHistoryCmd, NULL, NULL); Added: trunk/base/src/pextlib1.0/sysctl.c =================================================================== --- trunk/base/src/pextlib1.0/sysctl.c (rev 0) +++ trunk/base/src/pextlib1.0/sysctl.c 2009-07-01 05:04:01 UTC (rev 53197) @@ -0,0 +1,73 @@ +/* + * sysctl.c + * $Id$ + * + * Copyright (c) 2009 The MacPorts Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of The MacPorts Project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#if HAVE_CONFIG_H +#include <config.h> +#endif + +#include <tcl.h> + +#include <string.h> +#include <sys/errno.h> +#include <sys/types.h> +#include <sys/sysctl.h> + +/* + * Read-only wrapper for sysctlbyname(3). Only works for values of type CTLTYPE_INT. + */ +int SysctlCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +{ + const char error_message[] = "sysctl failed: "; + Tcl_Obj *tcl_result; + int res; + char *name; + int value; + size_t len = sizeof(value); + + if (objc != 2) { + Tcl_WrongNumArgs(interp, 1, objv, "name"); + return TCL_ERROR; + } + + name = Tcl_GetString(objv[1]); + res = sysctlbyname(name, &value, &len, NULL, 0); + if (res == -1) { + tcl_result = Tcl_NewStringObj(error_message, sizeof(error_message) - 1); + Tcl_AppendObjToObj(tcl_result, Tcl_NewStringObj(strerror(errno), -1)); + Tcl_SetObjResult(interp, tcl_result); + return TCL_ERROR; + } + + tcl_result = Tcl_NewIntObj(value); + Tcl_SetObjResult(interp, tcl_result); + return TCL_OK; +} Property changes on: trunk/base/src/pextlib1.0/sysctl.c ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: trunk/base/src/pextlib1.0/sysctl.h =================================================================== --- trunk/base/src/pextlib1.0/sysctl.h (rev 0) +++ trunk/base/src/pextlib1.0/sysctl.h 2009-07-01 05:04:01 UTC (rev 53197) @@ -0,0 +1,34 @@ +/* + * sysctl.h + * $Id$ + * + * Copyright (c) 2009 The MacPorts Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of The MacPorts Project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* Read-only wrapper for sysctlbyname(3) */ +int SysctlCmd(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]); Property changes on: trunk/base/src/pextlib1.0/sysctl.h ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: trunk/base/src/port1.0/portbuild.tcl =================================================================== --- trunk/base/src/port1.0/portbuild.tcl 2009-07-01 03:53:03 UTC (rev 53196) +++ trunk/base/src/port1.0/portbuild.tcl 2009-07-01 05:04:01 UTC (rev 53197) @@ -119,7 +119,7 @@ set jobs $buildmakejobs # if set to '0', use the number of cores for the number of jobs if {$jobs == 0} { - if {[catch {set jobs [exec "/usr/sbin/sysctl" "-n" "hw.availcpu"]}]} { + if {[catch {set jobs [sysctl hw.activecpu]}]} { set jobs 2 ui_warn "failed to determine the number of available CPUs (probably not supported on this platform)" ui_warn "defaulting to $jobs jobs, consider setting buildmakejobs to a nonzero value in macports.conf"