3 files changed, 81 insertions, 106 deletions

diff --git a/src/lib/libcrypto/threads/mttest.c b/src/lib/libcrypto/threads/mttest.c
index eba7aa8a6e..f6f3df4b6a 100644
--- a/src/lib/libcrypto/threads/mttest.c
+++ b/src/lib/libcrypto/threads/mttest.c
@@ -117,13 +117,11 @@ void solaris_locking_callback(int mode,int type,char *file,int line);
 void win32_locking_callback(int mode,int type,char *file,int line);
 void pthreads_locking_callback(int mode,int type,char *file,int line);
 void netware_locking_callback(int mode,int type,char *file,int line);
-void beos_locking_callback(int mode,int type,const char *file,int line);
 
 unsigned long irix_thread_id(void );
 unsigned long solaris_thread_id(void );
 unsigned long pthreads_thread_id(void );
 unsigned long netware_thread_id(void );
-unsigned long beos_thread_id(void );
 
 #if defined(OPENSSL_SYS_NETWARE)
 static MPKMutex *lock_cs;
@@ -1211,100 +1209,3 @@ unsigned long netware_thread_id(void)
    return(ret);
 }
 #endif /* NETWARE */
-
-#ifdef BEOS_THREADS
-
-#include <Locker.h>
-
-static BLocker** lock_cs;
-static long* lock_count;
-
-void thread_setup(void)
-        {
-        int i;
-
-        lock_cs=(BLocker**)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(BLocker*));
-        lock_count=(long*)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
-        for (i=0; i<CRYPTO_num_locks(); i++)
-                {
-                lock_count[i]=0;
-                lock_cs[i] = new BLocker(CRYPTO_get_lock_name(i));
-                }
-
-        CRYPTO_set_id_callback((unsigned long (*)())beos_thread_id);
-        CRYPTO_set_locking_callback(beos_locking_callback);
-        }
-
-void thread_cleanup(void)
-        {
-        int i;
-
-        CRYPTO_set_locking_callback(NULL);
-        fprintf(stderr,"cleanup\n");
-        for (i=0; i<CRYPTO_num_locks(); i++)
-                {
-                delete lock_cs[i];
-                fprintf(stderr,"%8ld:%s\n",lock_count[i],
-                        CRYPTO_get_lock_name(i));
-                }
-        OPENSSL_free(lock_cs);
-        OPENSSL_free(lock_count);
-
-        fprintf(stderr,"done cleanup\n");
-        }
-
-void beos_locking_callback(int mode, int type, const char *file, int line)
-    {
-#if 0
-        fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
-                CRYPTO_thread_id(),
-                (mode&CRYPTO_LOCK)?"l":"u",
-                (type&CRYPTO_READ)?"r":"w",file,line);
-#endif
-        if (mode & CRYPTO_LOCK)
-                {
-                lock_cs[type]->Lock();
-                lock_count[type]++;
-                }
-        else
-                {
-                lock_cs[type]->Unlock();
-                }
-        }
-
-void do_threads(SSL_CTX *s_ctx, SSL_CTX *c_ctx)
-        {
-        SSL_CTX *ssl_ctx[2];
-        thread_id thread_ctx[MAX_THREAD_NUMBER];
-        int i;
-
-        ssl_ctx[0]=s_ctx;
-        ssl_ctx[1]=c_ctx;
-
-        for (i=0; i<thread_number; i++)
-                {
-                thread_ctx[i] = spawn_thread((thread_func)ndoit,
-                        NULL, B_NORMAL_PRIORITY, (void *)ssl_ctx);
-                resume_thread(thread_ctx[i]);
-                }
-
-        printf("waiting...\n");
-        for (i=0; i<thread_number; i++)
-                {
-                status_t result;
-                wait_for_thread(thread_ctx[i], &result);
-                }
-
-        printf("beos threads done (%d,%d)\n",
-                s_ctx->references,c_ctx->references);
-        }
-
-unsigned long beos_thread_id(void)
-        {
-        unsigned long ret;
-
-        ret=(unsigned long)find_thread(NULL);
-        return(ret);
-        }
-
-#endif /* BEOS_THREADS */
diff --git a/src/lib/libcrypto/threads/netware.bat b/src/lib/libcrypto/threads/netware.bat
new file mode 100644
index 0000000000..0b3eca3caf
--- /dev/null
+++ b/src/lib/libcrypto/threads/netware.bat
@@ -0,0 +1,79 @@
+@echo off
+rem batch file to build multi-thread test ( mttest.nlm )
+
+rem command line arguments:
+rem      debug => build using debug settings
+
+rem
+rem After building, copy mttest.nlm to the server and run it, you'll probably
+rem want to redirect stdout and stderr.  An example command line would be
+rem "mttest.nlm -thread 20 -loops 10 -CAfile \openssl\apps\server.pem >mttest.out 2>mttest.err"
+rem 
+
+del mttest.nlm
+
+set BLD_DEBUG=
+set CFLAGS=
+set LFLAGS=
+set LIBS=
+
+if "%1" == "DEBUG" set BLD_DEBUG=YES
+if "%1" == "debug" set BLD_DEBUG=YES
+
+if "%MWCIncludes%" == "" goto inc_error
+if "%PRELUDE%" == "" goto prelude_error
+if "%IMPORTS%" == "" goto imports_error
+
+set CFLAGS=-c -I..\..\outinc_nw -nosyspath -DOPENSSL_SYS_NETWARE -opt off -g -sym internal -maxerrors 20
+
+if "%BLD_DEBUG%" == "YES" set LIBS=..\..\out_nw.dbg\ssl.lib ..\..\out_nw.dbg\crypto.lib
+if "%BLD_DEBUG%" == ""  set LIBS=..\..\out_nw\ssl.lib ..\..\out_nw\crypto.lib
+
+set LFLAGS=-msgstyle gcc -zerobss -stacksize 32768 -nostdlib -sym internal 
+  
+rem generate command file for metrowerks
+echo.
+echo Generating Metrowerks command file: mttest.def
+echo # dynamically generated command file for metrowerks build > mttest.def
+echo IMPORT @%IMPORTS%\clib.imp              >> mttest.def 
+echo IMPORT @%IMPORTS%\threads.imp           >> mttest.def 
+echo IMPORT @%IMPORTS%\ws2nlm.imp            >> mttest.def 
+echo IMPORT GetProcessSwitchCount            >> mttest.def
+echo MODULE clib                             >> mttest.def 
+
+rem compile
+echo.
+echo Compiling mttest.c
+mwccnlm.exe mttest.c %CFLAGS% 
+if errorlevel 1 goto end
+
+rem link               
+echo.
+echo Linking mttest.nlm
+mwldnlm.exe %LFLAGS% -screenname mttest -commandfile mttest.def mttest.o "%PRELUDE%" %LIBS% -o mttest.nlm
+if errorlevel 1 goto end
+
+goto end
+
+:inc_error
+echo.
+echo Environment variable MWCIncludes is not set - see install.nw
+goto end
+
+:prelude_error
+echo.
+echo Environment variable PRELUDE is not set - see install.nw
+goto end
+
+:imports_error
+echo.
+echo Environment variable IMPORTS is not set - see install.nw
+goto end
+    
+    
+:end
+set BLD_DEBUG=
+set CFLAGS=
+set LFLAGS=
+set LIBS=
+
diff --git a/src/lib/libcrypto/threads/pthreads-vms.com b/src/lib/libcrypto/threads/pthreads-vms.com
index 1cf92bdf57..63f5b8cc2e 100644
--- a/src/lib/libcrypto/threads/pthreads-vms.com
+++ b/src/lib/libcrypto/threads/pthreads-vms.com
@@ -2,13 +2,8 @@ $! To compile mttest on VMS.
 $!
 $! WARNING: only tested with DEC C so far.
 $
-$ if (f$getsyi("cpu").lt.128)
-$ then
-$     arch := VAX
-$ else
-$     arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
-$     if (arch .eqs. "") then arch = "UNK"
-$ endif
+$ arch := vax
+$ if f$getsyi("CPU") .ge. 128 then arch := axp
 $ define/user openssl [--.include.openssl]
 $ cc/def=PTHREADS mttest.c
 $ link mttest,[--.'arch'.exe.ssl]libssl/lib,[--.'arch'.exe.crypto]libcrypto/lib