Changeset 630 for trunk/src

Timestamp:

Mar 4, 2010, 7:39:52 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty/clucene: Added OS/2 support [patch by rudi].

Location:

trunk/src/3rdparty/clucene/src/CLucene

Files:

• LuceneThreads.h (modified) (1 diff)
• config/PlatformOS2.h (added)
• config/ThreadOS2.h (added)
• config/compiler.h (modified) (1 diff)
• config/threads.cpp (modified) (6 diffs)

trunk/src/3rdparty/clucene/src/CLucene/LuceneThreads.h

@@ -45 +45 @@
                 #endif
                 #include "CLucene/config/threadCSection.h"
+        #elif defined(_CL_HAVE_OS2_THREADS) || defined(__OS2__)
+                #if !defined(_CL_HAVE_OS2_THREADS)
+                #define _CL_HAVE_OS2_THREADS
+                #endif
+                #include "CLucene/config/threadOS2.h"
         #else
                 #error A valid thread library was not found

trunk/src/3rdparty/clucene/src/CLucene/config/compiler.h

@@ -80 +80 @@
 #define _WIN32
 #include "CLucene/config/PlatformWin32.h"
+
+#elif defined (__OS2__)
+#undef _OS2
+#define _OS2
+#include "CLucene/config/PlatformOS2.h"
 
 #elif defined (__WIN16) || defined (WIN16) || defined (_WIN16)

trunk/src/3rdparty/clucene/src/CLucene/config/threads.cpp

@@ -48 +48 @@
           extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId();
    #endif
-        
+
         mutex_win32::mutex_win32(const mutex_win32& clone){
-                InitializeCriticalSection(&mtx); 
+                InitializeCriticalSection(&mtx);
         }
         mutex_win32::mutex_win32()
-        { 
-                InitializeCriticalSection(&mtx); 
+        {
+                InitializeCriticalSection(&mtx);
         }
-        
+
         mutex_win32::~mutex_win32()
-        { 
-                DeleteCriticalSection(&mtx); 
+        {
+                DeleteCriticalSection(&mtx);
         }
-        
+
         void mutex_win32::lock()
-        { 
-                EnterCriticalSection(&mtx); 
+        {
+                EnterCriticalSection(&mtx);
         }
-        
+
         void mutex_win32::unlock()
-        { 
-                LeaveCriticalSection(&mtx); 
+        {
+                LeaveCriticalSection(&mtx);
         }
 
@@ -76 +76 @@
 #elif defined(_CL_HAVE_PTHREAD)
         #include "CLucene/config/threadPthread.h"
-                
+
         #ifdef _CL_HAVE_PTHREAD_MUTEX_RECURSIVE
                 bool mutex_pthread_attr_initd=false;
                 pthread_mutexattr_t mutex_pthread_attr;
         #endif
-        
+
         #ifdef _CL__CND_DEBUG
                 #define _CLPTHREAD_CHECK(c,m) CND_PRECONDITION(c==0,m)
@@ -92 +92 @@
                 _CLPTHREAD_CHECK(pthread_mutex_init(&mtx, &mutex_pthread_attr), "mutex_pthread(clone) constructor failed")
                 #else
-                #if defined(__hpux) && defined(_DECTHREADS_)
+                #if defined(__hpux) && defined(_DECTHREADS_)
                         _CLPTHREAD_CHECK(pthread_mutex_init(&mtx, pthread_mutexattr_default), "mutex_pthread(clone) constructor failed")
                 #else
@@ -102 +102 @@
         }
         mutex_pthread::mutex_pthread()
-        { 
+        {
                 #ifdef _CL_HAVE_PTHREAD_MUTEX_RECURSIVE
-                if ( mutex_pthread_attr_initd == false ){
-                        pthread_mutexattr_init(&mutex_pthread_attr);
-                        pthread_mutexattr_settype(&mutex_pthread_attr, PTHREAD_MUTEX_RECURSIVE);
-                        mutex_pthread_attr_initd = true;
+                if ( mutex_pthread_attr_initd == false ){
+                        pthread_mutexattr_init(&mutex_pthread_attr);
+                        pthread_mutexattr_settype(&mutex_pthread_attr, PTHREAD_MUTEX_RECURSIVE);
+                        mutex_pthread_attr_initd = true;
                 }
                 _CLPTHREAD_CHECK(pthread_mutex_init(&mtx, &mutex_pthread_attr), "mutex_pthread(clone) constructor failed")
@@ -141 +141 @@
                 #endif
         }
-        
+
         void mutex_pthread::unlock()
-        { 
+        {
                 #ifndef _CL_HAVE_PTHREAD_MUTEX_RECURSIVE
                 --lockCount;
@@ -156 +156 @@
         }
 
+#elif defined(_CL_HAVE_OS2_THREADS)
+        #include "CLucene/config/threadOS2.h"
+
+        mutex_os2::mutex_os2(const mutex_os2& clone)
+        {
+                DosCreateMutexSem(NULL, &mtx, 0, FALSE);
+        }
+
+        mutex_os2::mutex_os2()
+        {
+                DosCreateMutexSem(NULL, &mtx, 0, FALSE);
+        }
+
+        mutex_os2::~mutex_os2()
+        {
+                DosCloseMutexSem(mtx);
+        }
+
+        void mutex_os2::lock()
+        {
+                DosRequestMutexSem(mtx, SEM_INDEFINITE_WAIT);
+        }
+
+        void mutex_os2::unlock()
+        {
+                DosReleaseMutexSem(mtx);
+        }
+
+        ULONG mutex_os2::getCurrentTid(void)
+        {
+                PTIB pTIB;
+                return (DosGetInfoBlocks(&pTIB, NULL) == 0) ?
+                                pTIB->tib_ptib2->tib2_ultid : 1;
+        }
+
 #endif //thread impl choice