Front page | perl.perl5.porters |
Postings from March 2003
[PATCH 5.8.1 @19053] OS/2-related patches
Thread Next
From:
Ilya Zakharevich
Date:
March 31, 2003 12:44
Subject:
[PATCH 5.8.1 @19053] OS/2-related patches
Message ID:
20030331204337.GA3634@math.berkeley.edu
The fixes here are mostly support-threads and fix-minor-problems. The only
change in functionality is the chmod()/stat() fix (details below).
The only change which may influence non-OS/2 build is the support of CC_FLAGS
in makedef.pl; the change is made in the aix branch too (but not in win32
branch, since I only edited makedef.pl and Makefile.SH).
==== One needs to `make regen_symbols'
Thanks,
Ilya
ITEMIZED COMMENTS:
Configure - Many new OS/2 installation have Win32 too; if c:/
is NTFS, it is unreadable from OS/2. Another
way to test for DOSISH is needed. (Sorry, no patch
for a unit...)
- a changed logic to find 'uname' leads to OS/2 detection
needing to be repetited in a different 'case' branch.
- the logic to treate \\ in #line directives was flawed:
it used 'echo', which would interpret \\ before it
would be translated.
intrpvar.h - PL_sh_path needs to be a global, not interpreter
perlvars.h variable; (it is constant outside of OS/2, so this
sv.c should not matter on different platforms). To avoid
a shift in the binary layout of perl_interpreter,
we do not remove the interpreter variable, but rename
it.
makedef.pl - Better comment at the start of the generated file.
- support needed symbols for threaded and DEBUGGING
builds.
- Supports CC_FLAGS command line option to check for
configuration flags in OPTIMIZE makefile macro (e.g.,
for OPTIMIZE=-DDEBUGGING).
Makefile.SH - Put the CC_FLAGS= option on makedef.pl command line.
[Win32 uses another method?]
perlio.c - Missing aTHX_ added.
reentr.pl - The logic to support crypt_r() erroneously keys
on GLIBC. [Should be done by Configure instead!]
os2/Makefile.SHs - fix a mis-cut&paste.
os2/os2.c - pthreads join/detach emulation was flawed.
- CRT's stat() does not stat files in /dev/ filesystem.
Our stat() was emulating /dev/con and /dev/tty. Now
we also emulate /dev/nul and /dev/null. (Some tests
in test suite are skipped unless -f '/dev/null'.)
os2/os2.c - pthreads emulation was erroneously keyed on 5005threads.
os2/os2ish.h
- Support DOSISH attributes during [f]stat()/chmod().
archived is 0x1000000 = 0100000000
hidden is 0x2000000 = 0200000000
system is 0x4000000 = 0400000000
If extra flag 0x8000000 = 01000000000 is missing during
chmod(), these 3 flags are ignored; this extra flag
is set in the result of stat() [this provides backward
compatibility, as well as transparency of stat()/
chmod() supporting DOSISH].
- support of THX was cursory.
- The optimized PL_thr_key logic wouldn't survive fork().
os2/os2ish.h - quiet a couple of warning
os2/os2thread.h
os2/OS2/REXX/Changes - Switch to XSLoader. Use 'our' instead of `use vars'.
os2/OS2/REXX/REXX.pm
os2/OS2/REXX/DLL/DLL.pm
os2/OS2/PrfDB/Changes
os2/OS2/PrfDB/PrfDB.pm
os2/OS2/ExtAttr/Changes
os2/OS2/ExtAttr/ExtAttr.pm
ext/threads/threads.xs - support pthreads emulation
--- ./Configure-pre Thu Mar 20 22:13:56 2003
+++ ./Configure Mon Mar 24 19:31:02 2003
@@ -71,11 +71,12 @@ esac
: Proper separator for the PATH environment variable
p_=:
: On OS/2 this directory should exist if this is not floppy only system :-]
-if test -d c:/. ; then
+if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' ) 2>&1 >/dev/null ; then
if test -n "$OS2_SHELL"; then
p_=\;
PATH=`cmd /c "echo %PATH%" | tr '\\\\' / `
OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'`
+ is_os2=yes
elif test -n "$DJGPP"; then
case "X${MACHTYPE:-nonesuchmach}" in
*cygwin) ;;
@@ -1195,7 +1196,7 @@ elif test -f "/system/gnu_library/bin/ar
elif test -n "$DJGPP"; then
: DOS DJGPP
_exe=".exe"
-elif test -d c:/. ; then
+elif test -d c:/. -o -n "$is_os2" ; then
: OS/2 or cygwin
_exe=".exe"
fi
@@ -3137,6 +3138,9 @@ EOM
openbsd) osname=openbsd
osvers="$3"
;;
+ os2) osname=os2
+ osvers="$4"
+ ;;
POSIX-BC | posix-bc ) osname=posix-bc
osvers="$3"
;;
@@ -3255,7 +3259,7 @@ EOM
osname=news_os
fi
$rm -f UU/kernel.what
- elif test -d c:/.; then
+ elif test -d c:/. -o -n "$is_os2" ; then
set X $myuname
osname=os2
osvers="$5"
@@ -4978,6 +4982,7 @@ echo "Your cpp writes the filename in th
case "$osname" in
vos) cppfilter="tr '\\\\>' '/' |" ;; # path component separator is >
+os2) cppfilter="sed -e 's|\\\\\\\\|/|g' |" ;; # path component separator is \
*) cppfilter='' ;;
esac
: locate header file
--- ./intrpvar.h-pre Tue Mar 11 11:04:22 2003
+++ ./intrpvar.h Mon Mar 24 18:54:10 2003
@@ -248,7 +248,10 @@ PERLVAR(Iorigalen, U32)
PERLVAR(Ipidstatus, HV *) /* pid-to-status mappings for waitpid */
PERLVARI(Imaxo, int, MAXO) /* maximum number of ops */
PERLVAR(Iosname, char *) /* operating system */
-PERLVARI(Ish_path, char *, SH_PATH)/* full path of shell */
+
+/* For binary compatibility with older versions only */
+PERLVARI(Ish_path_compat, char *, SH_PATH)/* full path of shell */
+
PERLVAR(Isighandlerp, Sighandler_t)
PERLVAR(Ixiv_arenaroot, XPV*) /* list of allocated xiv areas */
--- ./makedef.pl-pre Mon Mar 10 14:11:18 2003
+++ ./makedef.pl Sat Mar 29 21:39:54 2003
@@ -6,13 +6,20 @@
# and by MacOS Classic.
#
# reads global.sym, pp.sym, perlvars.h, intrpvar.h, thrdvar.h, config.h
-# On OS/2 reads miniperl.map as well
+# On OS/2 reads miniperl.map and the previous version of perl5.def as well
my $PLATFORM;
my $CCTYPE;
while (@ARGV) {
my $flag = shift;
+ if ($flag =~ s/^CC_FLAGS=/ /) {
+ for my $fflag ($flag =~ /(?:^|\s)-D(\S+)/g) {
+ $fflag .= '=1' unless $fflag =~ /^(\w+)=/;
+ $define{$1} = $2 if $fflag =~ /^(\w+)=(.+)$/;
+ }
+ next;
+ }
$define{$1} = 1 if ($flag =~ /^-D(\w+)$/);
$define{$1} = $2 if ($flag =~ /^-D(\w+)=(.+)$/);
$CCTYPE = $1 if ($flag =~ /^CCTYPE=(\w+)$/);
@@ -418,7 +425,14 @@ elsif ($PLATFORM eq 'os2') {
os2error
ResetWinError
CroakWinError
+ PL_do_undump
)]);
+ emit_symbols([qw(os2_cond_wait
+ pthread_join
+ pthread_create
+ pthread_detach
+ )])
+ if $define{'USE_5005THREADS'} or $define{'USE_ITHREADS'};
}
elsif ($PLATFORM eq 'MacOS') {
skip_symbols [qw(
@@ -947,7 +961,7 @@ if ($define{'MULTIPLICITY'}) {
emit_symbols $glob;
}
# XXX AIX seems to want the perlvars.h symbols, for some reason
- if ($PLATFORM eq 'aix') {
+ if ($PLATFORM eq 'aix' or $PLATFORM eq 'os2') { # OS/2 needs PL_thr_key
my $glob = readvar($perlvars_h);
emit_symbols $glob;
}
--- ./Makefile.SH-pre Sun Mar 9 07:13:12 2003
+++ ./Makefile.SH Wed Mar 26 17:35:22 2003
@@ -450,7 +450,7 @@ PERLEXPORT = perl.exp
esac
$spitshell >>Makefile <<'!NO!SUBS!'
perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH)
- ./$(MINIPERLEXP) makedef.pl PLATFORM=aix | sort -u | sort -f > perl.exp.tmp
+ ./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f > perl.exp.tmp
sh mv-if-diff perl.exp.tmp perl.exp
!NO!SUBS!
@@ -460,7 +460,7 @@ os2)
MINIPERLEXP = miniperl
perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
- ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) > perl.exp.tmp
+ ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl.exp.tmp
sh mv-if-diff perl.exp.tmp perl5.def
!NO!SUBS!
--- ./perlio.c-pre Tue Mar 11 23:31:14 2003
+++ ./perlio.c Mon Mar 24 17:58:48 2003
@@ -3343,7 +3343,7 @@ PerlIOBuf_open(pTHX_ PerlIO_funcs *self,
#ifdef PERLIO_USING_CRLF
# ifdef PERLIO_IS_BINMODE_FD
if (PERLIO_IS_BINMODE_FD(fd))
- PerlIO_binmode(f, '<'/*not used*/, O_BINARY, Nullch);
+ PerlIO_binmode(aTHX_ f, '<'/*not used*/, O_BINARY, Nullch);
else
# endif
/*
--- ./perlvars.h-pre Sun Mar 2 14:40:14 2003
+++ ./perlvars.h Mon Mar 24 19:06:04 2003
@@ -67,3 +67,6 @@ PERLVARI(Gppid, IV, 0)
PERLVAR(Gdollarzero_mutex, perl_mutex) /* Modifying $0 */
#endif
+/* This is constant on most architectures, a global on OS/2 */
+PERLVARI(Gsh_path, char *, SH_PATH)/* full path of shell */
+
--- ./reentr.pl-pre Tue Mar 11 11:34:34 2003
+++ ./reentr.pl Sat Mar 29 18:49:14 2003
@@ -457,7 +457,7 @@ EOF
#endif
EOF
push @init, <<EOF;
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || defined(__EMX__)
PL_reentrant_buffer->_${func}_struct.initialized = 0;
/* work around glibc-2.2.5 bug */
PL_reentrant_buffer->_${func}_struct.current_saltbits = 0;
--- ./sv.c-pre Thu Mar 13 13:22:36 2003
+++ ./sv.c Fri Mar 28 16:49:26 2003
@@ -10736,7 +10740,7 @@ perl_clone_using(PerlInterpreter *proto_
PL_origalen = proto_perl->Iorigalen;
PL_pidstatus = newHV(); /* XXX flag for cloning? */
PL_osname = SAVEPV(proto_perl->Iosname);
- PL_sh_path = proto_perl->Ish_path; /* XXX never deallocated */
+ PL_sh_path_compat = proto_perl->Ish_path_compat; /* XXX never deallocated */
PL_sighandlerp = proto_perl->Isighandlerp;
--- ./os2/dl_os2.c-pre Fri Jul 19 16:50:02 2002
+++ ./os2/dl_os2.c Sun Mar 30 15:06:32 2003
@@ -8,13 +8,23 @@
static ULONG retcode;
static char fail[300];
+#ifdef PERL_CORE
+
+#include "EXTERN.h"
+#include "perl.h"
+
+#else
+
char *os2error(int rc);
+#endif
+
void *
dlopen(const char *path, int mode)
{
HMODULE handle;
- char tmp[260], *beg, *dot;
+ char tmp[260];
+ const char *beg, *dot;
ULONG rc;
fail[0] = 0;
--- ./os2/Makefile.SHs-pre Tue Mar 25 13:06:08 2003
+++ ./os2/Makefile.SHs Tue Mar 25 13:04:28 2003
@@ -27,7 +27,6 @@ $spitshell >>Makefile <<!GROK!THIS!
PERL_FULLVERSION = $perl_fullversion
-OPTIMIZE = $optimize
AOUT_OPTIMIZE = \$(OPTIMIZE)
AOUT_CCCMD = \$(CC) -DPERL_CORE $aout_ccflags \$(AOUT_OPTIMIZE)
AOUT_AR = $aout_ar
--- ./os2/os2.c-pre Sun Dec 22 23:48:34 2002
+++ ./os2/os2.c Sun Mar 30 15:14:12 2003
@@ -9,6 +9,7 @@
#define SPU_ENABLESUPPRESSION 1
#include <os2.h>
#include "dlfcn.h"
+#include <emx/syscalls.h>
#include <sys/uflags.h>
@@ -29,7 +30,7 @@
#include "EXTERN.h"
#include "perl.h"
-#ifdef USE_5005THREADS
+#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
typedef void (*emx_startroutine)(void *);
typedef void* (*pthreads_startroutine)(void *);
@@ -40,6 +41,8 @@ enum pthreads_state {
pthreads_st_exited,
pthreads_st_detached,
pthreads_st_waited,
+ pthreads_st_norun,
+ pthreads_st_exited_waited,
};
const char *pthreads_states[] = {
"uninit",
@@ -47,8 +50,24 @@ const char *pthreads_states[] = {
"exited",
"detached",
"waited for",
+ "could not start",
+ "exited, then waited on",
};
+enum pthread_exists { pthread_not_existant = -0xff };
+
+static const char*
+pthreads_state_string(enum pthreads_state state)
+{
+ if (state < 0 || state >= sizeof(pthreads_states)/sizeof(*pthreads_states)) {
+ static char buf[80];
+
+ snprintf(buf, sizeof(buf), "unknown thread state %d", (int)state);
+ return buf;
+ }
+ return pthreads_states[state];
+}
+
typedef struct {
void *status;
perl_cond cond;
@@ -63,43 +82,90 @@ int
pthread_join(perl_os_thread tid, void **status)
{
MUTEX_LOCK(&start_thread_mutex);
+ if (tid < 1 || tid >= thread_join_count) {
+ MUTEX_UNLOCK(&start_thread_mutex);
+ if (tid != pthread_not_existant)
+ Perl_croak_nocontext("panic: join with a thread with strange ordinal %d", (int)tid);
+ Perl_warn_nocontext("panic: join with a thread which could not start");
+ *status = 0;
+ return 0;
+ }
switch (thread_join_data[tid].state) {
case pthreads_st_exited:
- thread_join_data[tid].state = pthreads_st_none; /* Ready to reuse */
- MUTEX_UNLOCK(&start_thread_mutex);
+ thread_join_data[tid].state = pthreads_st_exited_waited;
*status = thread_join_data[tid].status;
+ MUTEX_UNLOCK(&start_thread_mutex);
+ COND_SIGNAL(&thread_join_data[tid].cond);
break;
case pthreads_st_waited:
MUTEX_UNLOCK(&start_thread_mutex);
Perl_croak_nocontext("join with a thread with a waiter");
break;
+ case pthreads_st_norun:
+ {
+ int state = (int)thread_join_data[tid].status;
+
+ thread_join_data[tid].state = pthreads_st_none;
+ MUTEX_UNLOCK(&start_thread_mutex);
+ Perl_croak_nocontext("panic: join with a thread which could not run"
+ " due to attempt of tid reuse (state='%s')",
+ pthreads_state_string(state));
+ break;
+ }
case pthreads_st_run:
+ {
+ perl_cond cond;
+
thread_join_data[tid].state = pthreads_st_waited;
+ thread_join_data[tid].status = (void *)status;
COND_INIT(&thread_join_data[tid].cond);
+ cond = thread_join_data[tid].cond;
+ COND_WAIT(&thread_join_data[tid].cond, &start_thread_mutex);
+ COND_DESTROY(&cond);
MUTEX_UNLOCK(&start_thread_mutex);
- COND_WAIT(&thread_join_data[tid].cond, NULL);
- COND_DESTROY(&thread_join_data[tid].cond);
- thread_join_data[tid].state = pthreads_st_none; /* Ready to reuse */
- *status = thread_join_data[tid].status;
break;
+ }
default:
MUTEX_UNLOCK(&start_thread_mutex);
- Perl_croak_nocontext("join: unknown thread state: '%s'",
- pthreads_states[thread_join_data[tid].state]);
+ Perl_croak_nocontext("panic: join with thread in unknown thread state: '%s'",
+ pthreads_state_string(thread_join_data[tid].state));
break;
}
return 0;
}
+typedef struct {
+ pthreads_startroutine sub;
+ void *arg;
+ void *ctx;
+} pthr_startit;
+
+/* The lock is used:
+ a) Since we temporarily usurp the caller interp, so malloc() may
+ use it to decide on debugging the call;
+ b) Since *args is on the caller's stack.
+ */
void
-pthread_startit(void *arg)
+pthread_startit(void *arg1)
{
/* Thread is already started, we need to transfer control only */
- pthreads_startroutine start_routine = *((pthreads_startroutine*)arg);
+ pthr_startit args = *(pthr_startit *)arg1;
int tid = pthread_self();
- void *retval;
-
- arg = ((void**)arg)[1];
+ void *rc;
+ int state;
+
+ if (tid <= 1) {
+ /* Can't croak, the setjmp() is not in scope... */
+ char buf[80];
+
+ snprintf(buf, sizeof(buf),
+ "panic: thread with strange ordinal %d created\n\r", tid);
+ write(2,buf,strlen(buf));
+ MUTEX_UNLOCK(&start_thread_mutex);
+ return;
+ }
+ /* Until args.sub resets it, makes debugging Perl_malloc() work: */
+ PERL_SET_CONTEXT(0);
if (tid >= thread_join_count) {
int oc = thread_join_count;
@@ -111,43 +177,89 @@ pthread_startit(void *arg)
Newz(1323, thread_join_data, thread_join_count, thread_join_t);
}
}
- if (thread_join_data[tid].state != pthreads_st_none)
- Perl_croak_nocontext("attempt to reuse thread id %i", tid);
+ if (thread_join_data[tid].state != pthreads_st_none) {
+ /* Can't croak, the setjmp() is not in scope... */
+ char buf[80];
+
+ snprintf(buf, sizeof(buf),
+ "panic: attempt to reuse thread id %d (state='%s')\n\r",
+ tid, pthreads_state_string(thread_join_data[tid].state));
+ write(2,buf,strlen(buf));
+ thread_join_data[tid].status = (void*)thread_join_data[tid].state;
+ thread_join_data[tid].state = pthreads_st_norun;
+ MUTEX_UNLOCK(&start_thread_mutex);
+ return;
+ }
thread_join_data[tid].state = pthreads_st_run;
/* Now that we copied/updated the guys, we may release the caller... */
MUTEX_UNLOCK(&start_thread_mutex);
- thread_join_data[tid].status = (*start_routine)(arg);
+ rc = (*args.sub)(args.arg);
+ MUTEX_LOCK(&start_thread_mutex);
switch (thread_join_data[tid].state) {
case pthreads_st_waited:
- COND_SIGNAL(&thread_join_data[tid].cond);
+ COND_SIGNAL(&thread_join_data[tid].cond);
+ thread_join_data[tid].state = pthreads_st_none;
+ *((void**)thread_join_data[tid].status) = rc;
break;
- default:
+ case pthreads_st_detached:
+ thread_join_data[tid].state = pthreads_st_none;
+ break;
+ case pthreads_st_run:
+ /* Somebody can wait on us; cannot exit, since OS can reuse the tid
+ and our waiter will get somebody else's status. */
thread_join_data[tid].state = pthreads_st_exited;
+ thread_join_data[tid].status = rc;
+ COND_INIT(&thread_join_data[tid].cond);
+ COND_WAIT(&thread_join_data[tid].cond, &start_thread_mutex);
+ COND_DESTROY(&thread_join_data[tid].cond);
+ thread_join_data[tid].state = pthreads_st_none; /* Ready to reuse */
break;
+ default:
+ state = thread_join_data[tid].state;
+ MUTEX_UNLOCK(&start_thread_mutex);
+ Perl_croak_nocontext("panic: unexpected thread state on exit: '%s'",
+ pthreads_state_string(state));
}
+ MUTEX_UNLOCK(&start_thread_mutex);
}
int
-pthread_create(perl_os_thread *tid, const pthread_attr_t *attr,
+pthread_create(perl_os_thread *tidp, const pthread_attr_t *attr,
void *(*start_routine)(void*), void *arg)
{
- void *args[2];
+ dTHX;
+ pthr_startit args;
- args[0] = (void*)start_routine;
- args[1] = arg;
+ args.sub = (void*)start_routine;
+ args.arg = arg;
+ args.ctx = PERL_GET_CONTEXT;
MUTEX_LOCK(&start_thread_mutex);
- *tid = _beginthread(pthread_startit, /*stack*/ NULL,
- /*stacksize*/ 10*1024*1024, (void*)args);
- MUTEX_LOCK(&start_thread_mutex);
+ /* Test suite creates 31 extra threads;
+ on machine without shared-memory-hogs this stack sizeis OK with 31: */
+ *tidp = _beginthread(pthread_startit, /*stack*/ NULL,
+ /*stacksize*/ 4*1024*1024, (void*)&args);
+ if (*tidp == -1) {
+ *tidp = pthread_not_existant;
+ MUTEX_UNLOCK(&start_thread_mutex);
+ return EINVAL;
+ }
+ MUTEX_LOCK(&start_thread_mutex); /* Wait for init to proceed */
MUTEX_UNLOCK(&start_thread_mutex);
- return *tid ? 0 : EINVAL;
+ return 0;
}
int
pthread_detach(perl_os_thread tid)
{
MUTEX_LOCK(&start_thread_mutex);
+ if (tid < 1 || tid >= thread_join_count) {
+ MUTEX_UNLOCK(&start_thread_mutex);
+ if (tid != pthread_not_existant)
+ Perl_croak_nocontext("panic: detach of a thread with strange ordinal %d", (int)tid);
+ Perl_warn_nocontext("detach of a thread which could not start");
+ return 0;
+ }
switch (thread_join_data[tid].state) {
case pthreads_st_waited:
MUTEX_UNLOCK(&start_thread_mutex);
@@ -157,16 +269,35 @@ pthread_detach(perl_os_thread tid)
thread_join_data[tid].state = pthreads_st_detached;
MUTEX_UNLOCK(&start_thread_mutex);
break;
+ case pthreads_st_exited:
+ MUTEX_UNLOCK(&start_thread_mutex);
+ COND_SIGNAL(&thread_join_data[tid].cond);
+ break;
+ case pthreads_st_detached:
+ MUTEX_UNLOCK(&start_thread_mutex);
+ Perl_warn_nocontext("detach on an already detached thread");
+ break;
+ case pthreads_st_norun:
+ {
+ int state = (int)thread_join_data[tid].status;
+
+ thread_join_data[tid].state = pthreads_st_none;
+ MUTEX_UNLOCK(&start_thread_mutex);
+ Perl_croak_nocontext("panic: detaching thread which could not run"
+ " due to attempt of tid reuse (state='%s')",
+ pthreads_state_string(state));
+ break;
+ }
default:
MUTEX_UNLOCK(&start_thread_mutex);
- Perl_croak_nocontext("detach: unknown thread state: '%s'",
- pthreads_states[thread_join_data[tid].state]);
+ Perl_croak_nocontext("panic: detach of a thread with unknown thread state: '%s'",
+ pthreads_state_string(thread_join_data[tid].state));
break;
}
return 0;
}
-/* This is a very bastardized version: */
+/* This is a very bastardized version; may be OK due to edge trigger of Wait */
int
os2_cond_wait(perl_cond *c, perl_mutex *m)
{
@@ -180,9 +311,10 @@ os2_cond_wait(perl_cond *c, perl_mutex *
Perl_croak_nocontext("panic: COND_WAIT: rc=%i", rc);
if (rc == ERROR_INTERRUPT)
errno = EINTR;
- if (m) MUTEX_LOCK(m);
+ if (m) MUTEX_LOCK(m);
+ return 0;
}
-#endif
+#endif
static int exe_is_aout(void);
@@ -1280,17 +1412,51 @@ int setgid(x) { errno = EINVAL; return -
#if OS2_STAT_HACK
+enum os2_stat_extra { /* EMX 0.9d fix 4 defines up to 0100000 */
+ os2_stat_archived = 0x1000000, /* 0100000000 */
+ os2_stat_hidden = 0x2000000, /* 0200000000 */
+ os2_stat_system = 0x4000000, /* 0400000000 */
+ os2_stat_force = 0x8000000, /* Do not ignore flags on chmod */
+};
+
+#define OS2_STAT_SPECIAL (os2_stat_system | os2_stat_archived | os2_stat_hidden)
+
+static void
+massage_os2_attr(struct stat *st)
+{
+ if ( ((st->st_mode & S_IFMT) != S_IFREG
+ && (st->st_mode & S_IFMT) != S_IFDIR)
+ || !(st->st_attr & (FILE_ARCHIVED | FILE_HIDDEN | FILE_SYSTEM)))
+ return;
+
+ if ( st->st_attr & FILE_ARCHIVED )
+ st->st_mode |= (os2_stat_archived | os2_stat_force);
+ if ( st->st_attr & FILE_HIDDEN )
+ st->st_mode |= (os2_stat_hidden | os2_stat_force);
+ if ( st->st_attr & FILE_SYSTEM )
+ st->st_mode |= (os2_stat_system | os2_stat_force);
+}
+
/* First attempt used DosQueryFSAttach which crashed the system when
used with 5.001. Now just look for /dev/. */
-
int
os2_stat(const char *name, struct stat *st)
{
static int ino = SHRT_MAX;
+ STRLEN l = strlen(name);
- if (stricmp(name, "/dev/con") != 0
- && stricmp(name, "/dev/tty") != 0)
- return stat(name, st);
+ if ( ( l < 8 || l > 9) || strnicmp(name, "/dev/", 5) != 0
+ || ( stricmp(name + 5, "con") != 0
+ && stricmp(name + 5, "tty") != 0
+ && stricmp(name + 5, "nul") != 0
+ && stricmp(name + 5, "null") != 0) ) {
+ int s = stat(name, st);
+
+ if (s)
+ return s;
+ massage_os2_attr(st);
+ return 0;
+ }
memset(st, 0, sizeof *st);
st->st_mode = S_IFCHR|0666;
@@ -1299,6 +1465,48 @@ os2_stat(const char *name, struct stat *
return 0;
}
+int
+os2_fstat(int handle, struct stat *st)
+{
+ int s = fstat(handle, st);
+
+ if (s)
+ return s;
+ massage_os2_attr(st);
+ return 0;
+}
+
+#undef chmod
+int
+os2_chmod (const char *name, int pmode) /* Modelled after EMX src/lib/io/chmod.c */
+{
+ int attr, rc;
+
+ if (!(pmode & os2_stat_force))
+ return chmod(name, pmode);
+
+ attr = __chmod (name, 0, 0); /* Get attributes */
+ if (attr < 0)
+ return -1;
+ if (pmode & S_IWRITE)
+ attr &= ~FILE_READONLY;
+ else
+ attr |= FILE_READONLY;
+ /* New logic */
+ attr &= ~(FILE_ARCHIVED | FILE_HIDDEN | FILE_SYSTEM);
+
+ if ( pmode & os2_stat_archived )
+ attr |= FILE_ARCHIVED;
+ if ( pmode & os2_stat_hidden )
+ attr |= FILE_HIDDEN;
+ if ( pmode & os2_stat_system )
+ attr |= FILE_SYSTEM;
+
+ rc = __chmod (name, 1, attr);
+ if (rc >= 0) rc = 0;
+ return rc;
+}
+
#endif
#ifdef USE_PERL_SBRK
@@ -1406,9 +1614,6 @@ mod2fname(pTHX_ SV *sv)
}
avlen --;
}
-#ifdef USE_5005THREADS
- sum++; /* Avoid conflict of DLLs in memory. */
-#endif
/* We always load modules as *specific* DLLs, and with the full name.
When loading a specific DLL by its full name, one cannot get a
different DLL, even if a DLL with the same basename is loaded already.
@@ -1446,6 +1651,7 @@ XS(XS_DynaLoader_mod2fname)
char *
os2error(int rc)
{
+ dTHX;
static char buf[300];
ULONG len;
char *s;
@@ -1492,8 +1698,11 @@ void
CroakWinError(int die, char *name)
{
FillWinError;
- if (die && Perl_rc)
- croak("%s: %s", (name ? name : "Win* API call"), os2error(Perl_rc));
+ if (die && Perl_rc) {
+ dTHX;
+
+ Perl_croak(aTHX_ "%s: %s", (name ? name : "Win* API call"), os2error(Perl_rc));
+ }
}
char *
@@ -1601,6 +1810,7 @@ Perl_Register_MQ(int serve)
/* 64 messages if before OS/2 3.0, ignored otherwise */
Perl_hmq = (*PMWIN_entries.CreateMsgQueue)(perl_hab_GET(), 64);
if (!Perl_hmq) {
+ dTHX;
static int cnt;
SAVEINT(cnt); /* Allow catch()ing. */
@@ -2240,6 +2450,7 @@ enum module_name_how { mod_name_handle,
static SV*
module_name_at(void *pp, enum module_name_how how)
{
+ dTHX;
char buf[MAXPATHLEN];
char *p = buf;
HMODULE mod;
@@ -2264,8 +2475,11 @@ module_name_at(void *pp, enum module_nam
static SV*
module_name_of_cv(SV *cv, enum module_name_how how)
{
- if (!cv || !SvROK(cv) || SvTYPE(SvRV(cv)) != SVt_PVCV || !CvXSUB(SvRV(cv)))
- croak("Not an XSUB reference");
+ if (!cv || !SvROK(cv) || SvTYPE(SvRV(cv)) != SVt_PVCV || !CvXSUB(SvRV(cv))) {
+ dTHX;
+
+ Perl_croak(aTHX_ "Not an XSUB reference");
+ }
return module_name_at(CvXSUB(SvRV(cv)), how);
}
@@ -2303,7 +2517,7 @@ XS(XS_OS2__control87)
{
dXSARGS;
if (items != 2)
- croak("Usage: OS2::_control87(new,mask)");
+ Perl_croak(aTHX_ "Usage: OS2::_control87(new,mask)");
{
unsigned new = (unsigned)SvIV(ST(0));
unsigned mask = (unsigned)SvIV(ST(1));
@@ -2320,7 +2534,7 @@ XS(XS_OS2_get_control87)
{
dXSARGS;
if (items != 0)
- croak("Usage: OS2::get_control87()");
+ Perl_croak(aTHX_ "Usage: OS2::get_control87()");
{
unsigned RETVAL;
@@ -2336,7 +2550,7 @@ XS(XS_OS2_set_control87)
{
dXSARGS;
if (items < 0 || items > 2)
- croak("Usage: OS2::set_control87(new=MCW_EM, mask=MCW_EM)");
+ Perl_croak(aTHX_ "Usage: OS2::set_control87(new=MCW_EM, mask=MCW_EM)");
{
unsigned new;
unsigned mask;
@@ -2757,7 +2971,9 @@ Perl_OS2_init3(char **env, void **preg,
if (PL_sh_path[i] == '\\') PL_sh_path[i] = '/';
}
}
+#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
MUTEX_INIT(&start_thread_mutex);
+#endif
os2_mytype = my_type(); /* Do it before morphing. Needed? */
/* Some DLLs reset FP flags on load. We may have been linked with them */
_control87(MCW_EM, MCW_EM);
@@ -3068,4 +3284,23 @@ char *
gcvt_os2 (double value, int digits, char *buffer)
{
return gcvt (value, digits, buffer);
+}
+
+#undef fork
+int fork_with_resources()
+{
+#if (defined(USE_5005THREADS) || defined(USE_ITHREADS)) && !defined(USE_SLOW_THREAD_SPECIFIC)
+ dTHX;
+ void *ctx = PERL_GET_CONTEXT;
+#endif
+
+ int rc = fork();
+
+#if (defined(USE_5005THREADS) || defined(USE_ITHREADS)) && !defined(USE_SLOW_THREAD_SPECIFIC)
+ if (rc == 0) { /* child */
+ ALLOC_THREAD_KEY; /* Acquire the thread-local memory */
+ PERL_SET_CONTEXT(ctx); /* Reinit the thread-local memory */
+ }
+#endif
+ return rc;
}
--- ./os2/os2ish.h-pre Fri Jul 19 16:50:02 2002
+++ ./os2/os2ish.h Sun Mar 30 15:22:48 2003
@@ -99,7 +99,7 @@
# undef I_SYS_UN
#endif
-#ifdef USE_5005THREADS
+#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
#define do_spawn(a) os2_do_spawn(aTHX_ (a))
#define do_aspawn(a,b,c) os2_do_aspawn(aTHX_ (a),(b),(c))
@@ -184,7 +184,7 @@ extern int rc;
# define pthread_getspecific(k) (*(k))
# define pthread_setspecific(k,v) (*(k)=(v),0)
# define pthread_key_create(keyp,flag) \
- ( DosAllocThreadLocalMemory(1,(U32*)keyp) \
+ ( DosAllocThreadLocalMemory(1,(unsigned long**)keyp) \
? Perl_croak_nocontext("LocalMemory"),1 \
: 0 \
)
@@ -401,15 +401,19 @@ char *ctermid(char *s);
#if OS2_STAT_HACK
#define Stat(fname,bufptr) os2_stat((fname),(bufptr))
-#define Fstat(fd,bufptr) fstat((fd),(bufptr))
+#define Fstat(fd,bufptr) os2_fstat((fd),(bufptr))
#define Fflush(fp) fflush(fp)
#define Mkdir(path,mode) mkdir((path),(mode))
+#define chmod(path,mode) os2_chmod((path),(mode))
#undef S_IFBLK
#undef S_ISBLK
-#define S_IFBLK 0120000
+#define S_IFBLK 0120000 /* Hacks to make things compile... */
#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
+int os2_chmod(const char *name, int pmode);
+int os2_fstat(int handle, struct stat *st);
+
#else
#define Stat(fname,bufptr) stat((fname),(bufptr))
@@ -670,11 +674,14 @@ void CroakWinError(int die, char *name);
#define PERLLIB_MANGLE(s, n) perllib_mangle((s), (n))
char *perllib_mangle(char *, unsigned int);
+#define fork fork_with_resources
+
typedef int (*Perl_PFN)();
Perl_PFN loadByOrdinal(enum entries_ordinals ord, int fail);
extern const Perl_PFN * const pExtFCN;
char *os2error(int rc);
int os2_stat(const char *name, struct stat *st);
+int fork_with_resources();
int setpriority(int which, int pid, int val);
int getpriority(int which /* ignored */, int pid);
--- ./os2/os2thread.h-pre Fri Jul 19 16:50:02 2002
+++ ./os2/os2thread.h Tue Mar 25 16:03:12 2003
@@ -7,6 +7,7 @@ typedef _rmutex perl_mutex;
/*typedef HEV perl_cond;*/ /* Will include os2.h into all C files. */
typedef unsigned long perl_cond;
+int os2_cond_wait(perl_cond *c, perl_mutex *m);
#ifdef USE_SLOW_THREAD_SPECIFIC
typedef int perl_key;
--- ./os2/OS2/REXX/REXX.pm-pre Fri Jul 19 16:50:02 2002
+++ ./os2/OS2/REXX/REXX.pm Wed Mar 26 14:53:40 2003
@@ -1,18 +1,17 @@
package OS2::REXX;
-use Carp;
require Exporter;
-require DynaLoader;
+use XSLoader;
require OS2::DLL;
-@ISA = qw(Exporter DynaLoader);
+@ISA = qw(Exporter);
# Items to export into callers namespace by default
# (move infrequently used names to @EXPORT_OK below)
@EXPORT = qw(REXX_call REXX_eval REXX_eval_with);
# Other items we are prepared to export if requested
@EXPORT_OK = qw(drop register);
-$VERSION = '1.01';
+$VERSION = '1.02';
# We cannot just put OS2::DLL in @ISA, since some scripts would use
# function interface, not method interface...
@@ -21,7 +20,7 @@ $VERSION = '1.01';
*load = \&OS2::DLL::load;
*find = \&OS2::DLL::find;
-bootstrap OS2::REXX;
+XSLoader::load 'OS2::REXX';
# Preloaded methods go here. Autoload methods go after __END__, and are
# processed by the autosplit program.
--- ./os2/OS2/REXX/DLL/DLL.pm-pre Fri Jul 19 16:50:02 2002
+++ ./os2/OS2/REXX/DLL/DLL.pm Wed Mar 26 14:51:44 2003
@@ -3,9 +3,7 @@ package OS2::DLL;
our $VERSION = '1.00';
use Carp;
-use DynaLoader;
-
-@ISA = qw(DynaLoader);
+use XSLoader;
sub AUTOLOAD {
$AUTOLOAD =~ /^OS2::DLL::.+::(.+)$/
@@ -86,7 +84,7 @@ EOE
return 1;
}
-bootstrap OS2::DLL;
+XSLoader::load 'OS2::DLL';
1;
__END__
--- ./os2/OS2/PrfDB/Changes-pre Fri Jul 19 16:50:02 2002
+++ ./os2/OS2/PrfDB/Changes Wed Mar 26 15:04:40 2003
@@ -3,3 +3,4 @@ Revision history for Perl extension OS2:
0.01 Tue Mar 26 19:35:27 1996
- original version; created by h2xs 1.16
0.02: Field do-not-close added to OS2::Prf::Hini.
+0.03: Update to XSLoader and 'our'.
--- ./os2/OS2/PrfDB/PrfDB.pm-pre Fri Jul 19 16:50:02 2002
+++ ./os2/OS2/PrfDB/PrfDB.pm Wed Mar 26 15:03:34 2003
@@ -1,21 +1,22 @@
package OS2::PrfDB;
use strict;
-use vars qw($VERSION @ISA @EXPORT);
require Exporter;
-require DynaLoader;
+use XSLoader;
+use Tie::Hash;
-@ISA = qw(Exporter DynaLoader);
+our $debug;
+our @ISA = qw(Exporter Tie::Hash);
# Items to export into callers namespace by default. Note: do not export
# names by default without a very good reason. Use EXPORT_OK instead.
# Do not simply export all your public functions/methods/constants.
-@EXPORT = qw(
- AnyIni UserIni SystemIni
- );
-$VERSION = '0.02';
+our @EXPORT = qw(
+ AnyIni UserIni SystemIni
+ );
+our $VERSION = '0.03';
-bootstrap OS2::PrfDB $VERSION;
+XSLoader::load 'OS2::PrfDB', $VERSION;
# Preloaded methods go here.
@@ -32,10 +33,6 @@ sub SystemIni {
new_from_int OS2::PrfDB::Hini OS2::Prf::System(2),'System settings database',1;
}
-use vars qw{$debug @ISA};
-use Tie::Hash;
-push @ISA, qw{Tie::Hash};
-
# Internal structure 0 => HINI, 1 => array of entries, 2 => iterator.
sub TIEHASH {
@@ -127,9 +124,10 @@ sub DESTROY {
}
package OS2::PrfDB::Sub;
-use vars qw{$debug @ISA};
use Tie::Hash;
-@ISA = qw{Tie::Hash};
+
+our $debug;
+our @ISA = qw{Tie::Hash};
# Internal structure 0 => HINI, 1 => array of entries, 2 => iterator,
# 3 => appname.
--- ./os2/OS2/ExtAttr/Changes-pre Fri Jul 19 16:50:02 2002
+++ ./os2/OS2/ExtAttr/Changes Wed Mar 26 15:07:10 2003
@@ -3,3 +3,5 @@ Revision history for Perl extension OS2:
0.01 Sun Apr 21 11:07:04 1996
- original version; created by h2xs 1.16
+0.02 Update to XSLoader and 'our'.
+ Remove Exporter.
--- ./os2/OS2/ExtAttr/ExtAttr.pm-pre Fri Jul 19 16:50:02 2002
+++ ./os2/OS2/ExtAttr/ExtAttr.pm Wed Mar 26 15:05:58 2003
@@ -1,21 +1,10 @@
package OS2::ExtAttr;
use strict;
-use vars qw($VERSION @ISA @EXPORT);
+use XSLoader;
-require Exporter;
-require DynaLoader;
-
-@ISA = qw(Exporter DynaLoader);
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-@EXPORT = qw(
-
-);
-$VERSION = '0.01';
-
-bootstrap OS2::ExtAttr $VERSION;
+our $VERSION = '0.02';
+XSLoader::load 'OS2::ExtAttr', $VERSION;
# Preloaded methods go here.
--- ./ext/threads/threads.xs-pre Sat Feb 1 14:28:04 2003
+++ ./ext/threads/threads.xs Tue Mar 25 15:41:06 2003
@@ -18,7 +18,11 @@ STMT_START {\
}\
} STMT_END
#else
+#ifdef OS2
+typedef perl_os_thread pthread_t;
+#else
#include <pthread.h>
+#endif
#include <thread.h>
#define PERL_THREAD_SETSPECIFIC(k,v) pthread_setspecific(k,v)
Thread Next
-
[PATCH 5.8.1 @19053] OS/2-related patches
by Ilya Zakharevich