Revision: 138165 https://trac.macports.org/changeset/138165 Author: cal@macports.org Date: 2015-06-30 13:58:44 -0700 (Tue, 30 Jun 2015) Log Message: ----------- base: rename pextlib flock to adv-flock to avoid conflict with TclX, closes #46733 This has come up a few times and is somehow related to the order in which the packages are loaded, but I haven't been able to pinpoint why exactly the order varies. Let's avoid wasting any time on the dirty details and just rename our own implementation. The new name is "adv-flock" for "advisory file lock". Modified Paths: -------------- trunk/base/src/pextlib1.0/Makefile.in trunk/base/src/pextlib1.0/Pextlib.c trunk/base/src/port1.0/portutil.tcl trunk/base/src/registry2.0/registry.tcl Added Paths: ----------- trunk/base/src/pextlib1.0/adv-flock.c trunk/base/src/pextlib1.0/adv-flock.h Removed Paths: ------------- trunk/base/src/pextlib1.0/flock.c trunk/base/src/pextlib1.0/flock.h Modified: trunk/base/src/pextlib1.0/Makefile.in =================================================================== --- trunk/base/src/pextlib1.0/Makefile.in 2015-06-30 20:47:25 UTC (rev 138164) +++ trunk/base/src/pextlib1.0/Makefile.in 2015-06-30 20:58:44 UTC (rev 138165) @@ -7,7 +7,7 @@ Pextlib.o strsed.o fgetln.o md5cmd.o setmode.o xinstall.o \ fs-traverse.o strcasecmp.o vercomp.o filemap.o base32cmd.o \ sha1cmd.o curl.o rmd160cmd.o sha256cmd.o readline.o uid.o \ - tracelib.o tty.o readdir.o pipe.o flock.o system.o \ + tracelib.o tty.o readdir.o pipe.o adv-flock.o system.o \ mktemp.o realpath.o ifneq (@ac_cv_func_strlcat@,yes) OBJS+=strlcat.o Modified: trunk/base/src/pextlib1.0/Pextlib.c =================================================================== --- trunk/base/src/pextlib1.0/Pextlib.c 2015-06-30 20:47:25 UTC (rev 138164) +++ trunk/base/src/pextlib1.0/Pextlib.c 2015-06-30 20:58:44 UTC (rev 138165) @@ -89,7 +89,7 @@ #include "strsed.h" #include "readdir.h" #include "pipe.h" -#include "flock.h" +#include "adv-flock.h" #include "system.h" #include "mktemp.h" #include "realpath.h" @@ -608,7 +608,7 @@ return TCL_ERROR; Tcl_CreateObjCommand(interp, "system", SystemCmd, NULL, NULL); - Tcl_CreateObjCommand(interp, "flock", FlockCmd, NULL, NULL); + Tcl_CreateObjCommand(interp, "adv-flock", AdvFlockCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "readdir", ReaddirCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "strsed", StrsedCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "mkstemp", MkstempCmd, NULL, NULL); Copied: trunk/base/src/pextlib1.0/adv-flock.c (from rev 138164, trunk/base/src/pextlib1.0/flock.c) =================================================================== --- trunk/base/src/pextlib1.0/adv-flock.c (rev 0) +++ trunk/base/src/pextlib1.0/adv-flock.c 2015-06-30 20:58:44 UTC (rev 138165) @@ -0,0 +1,256 @@ +/* + * adv-flock.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 + +/* needed to get struct sigaction on some platforms */ +#define _XOPEN_SOURCE 500L +/* the above hides flock on OS X without _DARWIN_C_SOURCE */ +#define _DARWIN_C_SOURCE + +#if HAVE_SYS_FILE_H +#include <sys/file.h> +#endif + +#include <errno.h> +#include <inttypes.h> +#include <signal.h> +#include <string.h> +#include <unistd.h> + +#include <tcl.h> + +#include "adv-flock.h" + +static volatile int alarmReceived = 0; + +static void alarmHandler(int sig UNUSED) { + alarmReceived = 1; +} + +int +AdvFlockCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { + static const char errorstr[] = "use one of \"-shared\", \"-exclusive\", or \"-unlock\", and optionally \"-noblock\""; + int operation = 0, fd, i, ret, sigret = TCL_OK; + int errnoval = 0; + int oshared = 0, oexclusive = 0, ounlock = 0, onoblock = 0, retry = 0; +#if defined(HAVE_LOCKF) && !defined(HAVE_FLOCK) + off_t curpos; +#endif + char *res; + Tcl_Channel channel; + ClientData handle; + struct sigaction sa_oldalarm, sa_alarm; + + if (objc < 3 || objc > 4) { + Tcl_WrongNumArgs(interp, 1, objv, "channelId switches"); + return TCL_ERROR; + } + + if ((channel = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL)) == NULL) { + Tcl_SetResult(interp, "error getting channel, result was NULL", TCL_STATIC); + return TCL_ERROR; + } + + if (Tcl_GetChannelHandle(channel, TCL_READABLE | TCL_WRITABLE, &handle) != TCL_OK) { + Tcl_SetResult(interp, "error getting channel handle", TCL_STATIC); + return TCL_ERROR; + } + fd = (int)(intptr_t)handle; + + for (i = 2; i < objc; i++) { + char *arg = Tcl_GetString(objv[i]); + if (!strcmp(arg, "-shared")) { + oshared = 1; + } + else if (!strcmp(arg, "-exclusive")) { + oexclusive = 1; + } + else if (!strcmp(arg, "-unlock")) { + ounlock = 1; + } + else if (!strcmp(arg, "-noblock")) { + onoblock = 1; + } + } + + /* verify the arguments */ + + if ((oshared + oexclusive + ounlock) != 1) { + /* only one of the options should have been specified */ + Tcl_SetResult(interp, (void *) &errorstr, TCL_STATIC); + return TCL_ERROR; + } + + if (onoblock && ounlock) { + /* should not be specified together */ + Tcl_SetResult(interp, "-noblock cannot be used with -unlock", TCL_STATIC); + return TCL_ERROR; + } + + /* (re-)enable SIGALRM so we can use alarm(3) to specify a timeout for the + * locking, do some Tcl signal processing and restart the locking to solve + * #43388. */ + memset(&sa_alarm, 0, sizeof(struct sigaction)); + sigemptyset(&sa_alarm.sa_mask); + sa_alarm.sa_flags = 0; /* explicitly don't specify SA_RESTART, we want the + following alarm(3) to interrupt the locking. */ + sa_alarm.sa_handler = alarmHandler; + sigaction(SIGALRM, &sa_alarm, &sa_oldalarm); + + do { + /* use a delay of one second */ + retry = 0; + alarmReceived = 0; + alarm(1); +#if HAVE_FLOCK + /* prefer flock if present */ + if (oshared) { + operation |= LOCK_SH; + } + + if (oexclusive) { + operation |= LOCK_EX; + } + + if (ounlock) { + operation |= LOCK_UN; + } + + if (onoblock) { + operation |= LOCK_NB; + } + + ret = flock(fd, operation); + if (ret == -1) { + errnoval = errno; + } +#else +#if HAVE_LOCKF + if (ounlock) { + operation = F_ULOCK; + } + + /* lockf semantics don't map to shared locks. */ + if (oshared || oexclusive) { + if (onoblock) { + operation = F_TLOCK; + } + else { + operation = F_LOCK; + } + } + + curpos = lseek(fd, 0, SEEK_CUR); + if (curpos == -1) { + Tcl_SetResult(interp, (void *) "Seek error", TCL_STATIC); + return TCL_ERROR; + } + + ret = lockf(fd, operation, 0); /* lock entire file */ + if (ret == -1) { + errnoval = errno; + } + + curpos = lseek(fd, curpos, SEEK_SET); + if (curpos == -1) { + Tcl_SetResult(interp, (void *) "Seek error", TCL_STATIC); + return TCL_ERROR; + } +#else +#error no available locking implementation +#endif /* HAVE_LOCKF */ +#endif /* HAVE_FLOCK */ + /* disable the alarm timer */ + alarm(0); + + if (ret == -1) { + if (oshared || oexclusive) { + if (!onoblock && alarmReceived && errnoval == EINTR) { + /* We were trying to lock, the lock was supposed to block, + * it failed with EINTR and we processed a SIGALRM. This + * probably means the call was interrupted by the timer. + * Call Tcl signal processing functions and try again. */ + if (Tcl_AsyncReady()) { + sigret = Tcl_AsyncInvoke(interp, TCL_OK); + if (sigret != TCL_OK) { + break; + } + } + retry = 1; + continue; + } + + if (onoblock && errnoval == EAGAIN) { + /* The lock wasn't supposed to block, and the lock wasn't + * successful because the lock is taken. On some systems + * EAGAIN == EWOULDBLOCK, but let's play it safe. */ + errnoval = EWOULDBLOCK; + } + } + } + } while (retry); + + /* Restore the previous handler for SIGALRM */ + sigaction(SIGALRM, &sa_oldalarm, NULL); + + if (sigret != TCL_OK) { + /* We received a signal that raised an error. The file hasn't been + * locked. */ + return sigret; + } + + if (ret != 0) { + switch (errnoval) { + case EAGAIN: + res = "EAGAIN"; + break; + case EBADF: + res = "EBADF"; + break; + case EINVAL: + res = "EINVAL"; + break; + case EOPNOTSUPP: + res = "EOPNOTSUPP"; + break; + default: + res = strerror(errno); + break; + } + Tcl_SetResult(interp, (void *) res, TCL_STATIC); + return TCL_ERROR; + } + return TCL_OK; +} Copied: trunk/base/src/pextlib1.0/adv-flock.h (from rev 137292, trunk/base/src/pextlib1.0/flock.h) =================================================================== --- trunk/base/src/pextlib1.0/adv-flock.h (rev 0) +++ trunk/base/src/pextlib1.0/adv-flock.h 2015-06-30 20:58:44 UTC (rev 138165) @@ -0,0 +1,33 @@ +/* + * adv-flock.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. + */ + +int AdvFlockCmd(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]); Deleted: trunk/base/src/pextlib1.0/flock.c =================================================================== --- trunk/base/src/pextlib1.0/flock.c 2015-06-30 20:47:25 UTC (rev 138164) +++ trunk/base/src/pextlib1.0/flock.c 2015-06-30 20:58:44 UTC (rev 138165) @@ -1,256 +0,0 @@ -/* - * flock.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 - -/* needed to get struct sigaction on some platforms */ -#define _XOPEN_SOURCE 500L -/* the above hides flock on OS X without _DARWIN_C_SOURCE */ -#define _DARWIN_C_SOURCE - -#if HAVE_SYS_FILE_H -#include <sys/file.h> -#endif - -#include <errno.h> -#include <inttypes.h> -#include <signal.h> -#include <string.h> -#include <unistd.h> - -#include <tcl.h> - -#include "flock.h" - -static volatile int alarmReceived = 0; - -static void alarmHandler(int sig UNUSED) { - alarmReceived = 1; -} - -int -FlockCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - static const char errorstr[] = "use one of \"-shared\", \"-exclusive\", or \"-unlock\", and optionally \"-noblock\""; - int operation = 0, fd, i, ret, sigret = TCL_OK; - int errnoval = 0; - int oshared = 0, oexclusive = 0, ounlock = 0, onoblock = 0, retry = 0; -#if defined(HAVE_LOCKF) && !defined(HAVE_FLOCK) - off_t curpos; -#endif - char *res; - Tcl_Channel channel; - ClientData handle; - struct sigaction sa_oldalarm, sa_alarm; - - if (objc < 3 || objc > 4) { - Tcl_WrongNumArgs(interp, 1, objv, "channelId switches"); - return TCL_ERROR; - } - - if ((channel = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL)) == NULL) { - Tcl_SetResult(interp, "error getting channel, result was NULL", TCL_STATIC); - return TCL_ERROR; - } - - if (Tcl_GetChannelHandle(channel, TCL_READABLE | TCL_WRITABLE, &handle) != TCL_OK) { - Tcl_SetResult(interp, "error getting channel handle", TCL_STATIC); - return TCL_ERROR; - } - fd = (int)(intptr_t)handle; - - for (i = 2; i < objc; i++) { - char *arg = Tcl_GetString(objv[i]); - if (!strcmp(arg, "-shared")) { - oshared = 1; - } - else if (!strcmp(arg, "-exclusive")) { - oexclusive = 1; - } - else if (!strcmp(arg, "-unlock")) { - ounlock = 1; - } - else if (!strcmp(arg, "-noblock")) { - onoblock = 1; - } - } - - /* verify the arguments */ - - if ((oshared + oexclusive + ounlock) != 1) { - /* only one of the options should have been specified */ - Tcl_SetResult(interp, (void *) &errorstr, TCL_STATIC); - return TCL_ERROR; - } - - if (onoblock && ounlock) { - /* should not be specified together */ - Tcl_SetResult(interp, "-noblock cannot be used with -unlock", TCL_STATIC); - return TCL_ERROR; - } - - /* (re-)enable SIGALRM so we can use alarm(3) to specify a timeout for the - * locking, do some Tcl signal processing and restart the locking to solve - * #43388. */ - memset(&sa_alarm, 0, sizeof(struct sigaction)); - sigemptyset(&sa_alarm.sa_mask); - sa_alarm.sa_flags = 0; /* explicitly don't specify SA_RESTART, we want the - following alarm(3) to interrupt the locking. */ - sa_alarm.sa_handler = alarmHandler; - sigaction(SIGALRM, &sa_alarm, &sa_oldalarm); - - do { - /* use a delay of one second */ - retry = 0; - alarmReceived = 0; - alarm(1); -#if HAVE_FLOCK - /* prefer flock if present */ - if (oshared) { - operation |= LOCK_SH; - } - - if (oexclusive) { - operation |= LOCK_EX; - } - - if (ounlock) { - operation |= LOCK_UN; - } - - if (onoblock) { - operation |= LOCK_NB; - } - - ret = flock(fd, operation); - if (ret == -1) { - errnoval = errno; - } -#else -#if HAVE_LOCKF - if (ounlock) { - operation = F_ULOCK; - } - - /* lockf semantics don't map to shared locks. */ - if (oshared || oexclusive) { - if (onoblock) { - operation = F_TLOCK; - } - else { - operation = F_LOCK; - } - } - - curpos = lseek(fd, 0, SEEK_CUR); - if (curpos == -1) { - Tcl_SetResult(interp, (void *) "Seek error", TCL_STATIC); - return TCL_ERROR; - } - - ret = lockf(fd, operation, 0); /* lock entire file */ - if (ret == -1) { - errnoval = errno; - } - - curpos = lseek(fd, curpos, SEEK_SET); - if (curpos == -1) { - Tcl_SetResult(interp, (void *) "Seek error", TCL_STATIC); - return TCL_ERROR; - } -#else -#error no available locking implementation -#endif /* HAVE_LOCKF */ -#endif /* HAVE_FLOCK */ - /* disable the alarm timer */ - alarm(0); - - if (ret == -1) { - if (oshared || oexclusive) { - if (!onoblock && alarmReceived && errnoval == EINTR) { - /* We were trying to lock, the lock was supposed to block, - * it failed with EINTR and we processed a SIGALRM. This - * probably means the call was interrupted by the timer. - * Call Tcl signal processing functions and try again. */ - if (Tcl_AsyncReady()) { - sigret = Tcl_AsyncInvoke(interp, TCL_OK); - if (sigret != TCL_OK) { - break; - } - } - retry = 1; - continue; - } - - if (onoblock && errnoval == EAGAIN) { - /* The lock wasn't supposed to block, and the lock wasn't - * successful because the lock is taken. On some systems - * EAGAIN == EWOULDBLOCK, but let's play it safe. */ - errnoval = EWOULDBLOCK; - } - } - } - } while (retry); - - /* Restore the previous handler for SIGALRM */ - sigaction(SIGALRM, &sa_oldalarm, NULL); - - if (sigret != TCL_OK) { - /* We received a signal that raised an error. The file hasn't been - * locked. */ - return sigret; - } - - if (ret != 0) { - switch (errnoval) { - case EAGAIN: - res = "EAGAIN"; - break; - case EBADF: - res = "EBADF"; - break; - case EINVAL: - res = "EINVAL"; - break; - case EOPNOTSUPP: - res = "EOPNOTSUPP"; - break; - default: - res = strerror(errno); - break; - } - Tcl_SetResult(interp, (void *) res, TCL_STATIC); - return TCL_ERROR; - } - return TCL_OK; -} Deleted: trunk/base/src/pextlib1.0/flock.h =================================================================== --- trunk/base/src/pextlib1.0/flock.h 2015-06-30 20:47:25 UTC (rev 138164) +++ trunk/base/src/pextlib1.0/flock.h 2015-06-30 20:58:44 UTC (rev 138165) @@ -1,33 +0,0 @@ -/* - * flock.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. - */ - -int FlockCmd(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]); Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2015-06-30 20:47:25 UTC (rev 138164) +++ trunk/base/src/port1.0/portutil.tcl 2015-06-30 20:58:44 UTC (rev 138165) @@ -1817,10 +1817,10 @@ set fd [open $statefile a+] if {![tbool ports_dryrun]} { - if {[catch {flock $fd -exclusive -noblock} result]} { + if {[catch {adv-flock $fd -exclusive -noblock} result]} { if {"$result" == "EAGAIN"} { ui_notice "Waiting for lock on $statefile" - flock $fd -exclusive + adv-flock $fd -exclusive } elseif {"$result" == "EOPNOTSUPP"} { # Locking not supported, just return return $fd Modified: trunk/base/src/registry2.0/registry.tcl =================================================================== --- trunk/base/src/registry2.0/registry.tcl 2015-06-30 20:47:25 UTC (rev 138164) +++ trunk/base/src/registry2.0/registry.tcl 2015-06-30 20:58:44 UTC (rev 138165) @@ -395,10 +395,10 @@ } set lockfd [::open $lockpath w] } - if {[catch {flock $lockfd -exclusive -noblock} result]} { + if {[catch {adv-flock $lockfd -exclusive -noblock} result]} { if {$result eq "EAGAIN"} { ui_msg "Waiting for lock on $lockpath" - flock $lockfd -exclusive + adv-flock $lockfd -exclusive } elseif {$result eq "EOPNOTSUPP"} { # Locking not supported, just return ui_debug "flock not supported, not locking registry" @@ -420,7 +420,7 @@ } if {[info exists lockfd]} { # not much point trying to handle errors - catch {flock $lockfd -unlock} + catch {adv-flock $lockfd -unlock} } }