OS/2 socket fixes.

[p5sagit/p5-mst-13.2.git] / os2 / os2ish.h

diff --git a/os2/os2ish.h b/os2/os2ish.h
index 4506bb4..6993dfc 100644 (file)
--- a/os2/os2ish.h
+++ b/os2/os2ish.h
@@ -68,6 +68,13 @@
 
 #define BIT_BUCKET "/dev/nul"  /* Will this work? */
 
+/* Apparently TCPIPV4 defines may be included even with only IAK present */
+
+#if !defined(NO_TCPIPV4) && !defined(TCPIPV4)
+#  define TCPIPV4
+#  define TCPIPV4_FORCED               /* Just in case */
+#endif
+
 #if defined(I_SYS_UN) && !defined(TCPIPV4)
 /* It is not working without TCPIPV4 defined. */
 # undef I_SYS_UN
@@ -144,15 +151,22 @@ extern int rc;
        if ((rc = DosCloseEventSem(*(c))))                      \
            croak("panic: COND_DESTROY, rc=%i", rc);            \
     } STMT_END
-/*#define THR ((struct thread *) TlsGetValue(thr_key))
+/*#define THR ((struct thread *) TlsGetValue(PL_thr_key))
 #define dTHR struct thread *thr = THR
 */
 
-#define pthread_getspecific(k)         (*_threadstore())
-#define pthread_setspecific(k,v)       (*_threadstore()=v,0)
+#ifdef USE_SLOW_THREAD_SPECIFIC
+#  define pthread_getspecific(k)       (*_threadstore())
+#  define pthread_setspecific(k,v)     (*_threadstore()=v,0)
+#  define pthread_key_create(keyp,flag)        (*keyp=_gettid(),0)
+#else
+#  define pthread_getspecific(k)       (*(k))
+#  define pthread_setspecific(k,v)     (*(k)=(v),0)
+#  define pthread_key_create(keyp,flag)        (DosAllocThreadLocalMemory(1,(U32*)keyp) ? croak("LocalMemory"),1 : 0)
+#endif
+#define pthread_key_delete(keyp)
 #define pthread_self()                 _gettid()
-#define pthread_key_create(keyp,flag)  (*keyp=_gettid(),0)
-#define sched_yield()  DosSleep(0)
+#define YIELD                          DosSleep(0)
 
 #ifdef PTHREADS_INCLUDED               /* For ./x2p stuff. */
 int pthread_join(pthread_t tid, void **status);
@@ -169,11 +183,16 @@ void Perl_OS2_init(char **);
 
 /* XXX This code hideously puts env inside: */
 
-#define PERL_SYS_INIT(argcp, argvp) STMT_START {       \
+#ifdef __EMX__
+#  define PERL_SYS_INIT(argcp, argvp) STMT_START {     \
     _response(argcp, argvp);                   \
     _wildcard(argcp, argvp);                   \
     Perl_OS2_init(env);        } STMT_END
-
+#else  /* Compiling embedded Perl with non-EMX compiler */
+#  define PERL_SYS_INIT(argcp, argvp) STMT_START {     \
+    Perl_OS2_init(env);        } STMT_END
+#  define PERL_CALLCONV _System
+#endif
 #define PERL_SYS_TERM()                MALLOC_TERM
 
 /* #define PERL_SYS_TERM() STMT_START {        \
@@ -287,6 +306,10 @@ typedef struct OS2_Perl_data {
   int (*xs_init)();
   unsigned long rc;
   unsigned long severity;
+  unsigned long        phmq;                   /* Handle to message queue */
+  unsigned long        phmq_refcnt;
+  unsigned long        phmq_servers;
+  unsigned long        initial_mode;           /* VIO etc. mode we were started in */
 } OS2_Perl_data_t;
 
 extern OS2_Perl_data_t OS2_Perl_data;
@@ -300,6 +323,42 @@ extern OS2_Perl_data_t OS2_Perl_data;
 #define Perl_HAB_set   (OS2_Perl_flags & Perl_HAB_set_f)
 #define set_Perl_HAB_f (OS2_Perl_flags |= Perl_HAB_set_f)
 #define set_Perl_HAB(h) (set_Perl_HAB_f, Perl_hab = h)
+#define _obtain_Perl_HAB (init_PMWIN_entries(),                                \
+                         Perl_hab = (*PMWIN_entries.Initialize)(0),    \
+                         set_Perl_HAB_f, Perl_hab)
+#define perl_hab_GET() (Perl_HAB_set ? Perl_hab : _obtain_Perl_HAB)
+#define Acquire_hab()  perl_hab_GET()
+#define Perl_hmq       ((HMQ)OS2_Perl_data.phmq)
+#define Perl_hmq_refcnt        (OS2_Perl_data.phmq_refcnt)
+#define Perl_hmq_servers       (OS2_Perl_data.phmq_servers)
+#define Perl_os2_initial_mode  (OS2_Perl_data.initial_mode)
+
+unsigned long Perl_hab_GET();
+unsigned long Perl_Register_MQ(int serve);
+void   Perl_Deregister_MQ(int serve);
+int    Perl_Serve_Messages(int force);
+/* Cannot prototype with I32 at this point. */
+int    Perl_Process_Messages(int force, long *cntp);
+
+struct _QMSG;
+struct PMWIN_entries_t {
+    unsigned long (*Initialize)( unsigned long fsOptions );
+    unsigned long (*CreateMsgQueue)(unsigned long hab, long cmsg);
+    int (*DestroyMsgQueue)(unsigned long hmq);
+    int (*PeekMsg)(unsigned long hab, struct _QMSG *pqmsg,
+                  unsigned long hwndFilter, unsigned long msgFilterFirst,
+                  unsigned long msgFilterLast, unsigned long fl);
+    int (*GetMsg)(unsigned long hab, struct _QMSG *pqmsg,
+                 unsigned long hwndFilter, unsigned long msgFilterFirst,
+                 unsigned long msgFilterLast);
+    void * (*DispatchMsg)(unsigned long hab, struct _QMSG *pqmsg);
+};
+extern struct PMWIN_entries_t PMWIN_entries;
+void init_PMWIN_entries(void);
+
+#define perl_hmq_GET(serve)    Perl_Register_MQ(serve);
+#define perl_hmq_UNSET(serve)  Perl_Deregister_MQ(serve);
+
 #define OS2_XS_init() (*OS2_Perl_data.xs_init)()
 /* The expressions below return true on error. */
 /* INCL_DOSERRORS needed. rc should be declared outside. */
@@ -314,11 +373,6 @@ extern OS2_Perl_data_t OS2_Perl_data;
                        errno = errno_isOS2,                            \
                        Perl_severity = ERRORIDSEV(Perl_rc),            \
                        Perl_rc = ERRORIDERROR(Perl_rc)) 
-#define Acquire_hab() if (!Perl_HAB_set) {                             \
-          Perl_hab = WinInitialize(0);                                 \
-          if (!Perl_hab) die("WinInitialize failed");                  \
-          set_Perl_HAB_f;                                              \
-       }
 
 #define STATIC_FILE_LENGTH 127