move mutexImpl etc. to dtoolconfig

panda/src/express/Sources.pp

@@ -45,12 +45,7 @@
     multifile.I multifile.h \
     mutexDebug.h mutexDebug.I \
     mutexDirect.h mutexDirect.I \
-    mutexDummyImpl.h mutexDummyImpl.I \
     mutexHolder.h mutexHolder.I \
-    mutexImpl.h \
-    mutexNsprImpl.h mutexNsprImpl.I \
-    mutexPosixImpl.h mutexPosixImpl.I \
-    mutexWin32Impl.h mutexWin32Impl.I \
     namable.I \
     namable.h nativeNumericData.I nativeNumericData.h \
     numeric_types.h \
@@ -70,7 +65,6 @@
     reMutexDirect.h reMutexDirect.I \
     reMutexHolder.I reMutexHolder.h \
     reversedNumericData.I reversedNumericData.h \
-    selectThreadImpl.h \
     streamReader.I streamReader.h streamWriter.I streamWriter.h \
     stringDecoder.h stringDecoder.I \
     subStream.I subStream.h subStreamBuf.h \
@@ -124,10 +118,6 @@
     mutexDebug.cxx \
     mutexDirect.cxx \
     mutexHolder.cxx \
-    mutexDummyImpl.cxx \
-    mutexNsprImpl.cxx \
-    mutexPosixImpl.cxx \
-    mutexWin32Impl.cxx \
     pmutex.cxx \
     namable.cxx \
     nativeNumericData.cxx \
@@ -204,12 +194,7 @@
     memoryUsagePointers.h multifile.I multifile.h \
     mutexDebug.h mutexDebug.I \
     mutexDirect.h mutexDirect.I \
-    mutexDummyImpl.h mutexDummyImpl.I \
     mutexHolder.h mutexHolder.I \
-    mutexImpl.h \
-    mutexNsprImpl.h mutexNsprImpl.I \
-    mutexPosixImpl.h mutexPosixImpl.I \
-    mutexWin32Impl.h mutexWin32Impl.I \
     namable.I namable.h \
     nativeNumericData.I nativeNumericData.h numeric_types.h \
     ordered_vector.h ordered_vector.I ordered_vector.T \
@@ -228,7 +213,6 @@
     reMutexDirect.h reMutexDirect.I \
     reMutexHolder.I reMutexHolder.h \
     reversedNumericData.I reversedNumericData.h \
-    selectThreadImpl.h \
     streamReader.I streamReader.h streamWriter.I streamWriter.h \
     stringDecoder.h stringDecoder.I \
     subStream.I subStream.h subStreamBuf.h \

panda/src/express/express_composite1.cxx

@@ -34,10 +34,6 @@
 #include "mutexDebug.cxx"
 #include "mutexDirect.cxx"
 #include "mutexHolder.cxx"
-#include "mutexDummyImpl.cxx"
-#include "mutexNsprImpl.cxx"
-#include "mutexPosixImpl.cxx"
-#include "mutexWin32Impl.cxx"
 #include "namable.cxx"
 #include "nativeNumericData.cxx"
 #include "ordered_vector.cxx"

panda/src/express/mutexDummyImpl.I

@@ -1,54 +0,0 @@
-// Filename: mutexDummyImpl.I
-// Created by:  drose (08Aug02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexDummyImpl::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE MutexDummyImpl::
-MutexDummyImpl() {
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexDummyImpl::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE MutexDummyImpl::
-~MutexDummyImpl() {
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexDummyImpl::lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void MutexDummyImpl::
-lock() {
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexDummyImpl::release
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void MutexDummyImpl::
-release() {
-}

panda/src/express/mutexDummyImpl.cxx

@@ -1,25 +0,0 @@
-// Filename: mutexDummyImpl.cxx
-// Created by:  drose (08Aug02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#include "selectThreadImpl.h"
-
-#ifdef THREAD_DUMMY_IMPL
-
-#include "mutexDummyImpl.h"
-
-#endif  // THREAD_DUMMY_IMPL

panda/src/express/mutexDummyImpl.h

@@ -1,48 +0,0 @@
-// Filename: mutexDummyImpl.h
-// Created by:  drose (08Aug02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef MUTEXDUMMYIMPL_H
-#define MUTEXDUMMYIMPL_H
-
-#include "pandabase.h"
-#include "selectThreadImpl.h"
-
-#ifdef THREAD_DUMMY_IMPL
-
-#include "notify.h"
-
-////////////////////////////////////////////////////////////////////
-//       Class : MutexDummyImpl
-// Description : A fake mutex implementation for single-threaded
-//               applications that don't need any synchronization
-//               control.  This does nothing at all.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDAEXPRESS MutexDummyImpl {
-public:
-  INLINE MutexDummyImpl();
-  INLINE ~MutexDummyImpl();
-
-  INLINE void lock();
-  INLINE void release();
-};
-
-#include "mutexDummyImpl.I"
-
-#endif  // THREAD_DUMMY_IMPL
-
-#endif

panda/src/express/mutexImpl.h

@@ -1,57 +0,0 @@
-// Filename: mutexImpl.h
-// Created by:  drose (08Aug02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef MUTEXIMPL_H
-#define MUTEXIMPL_H
-
-#include "pandabase.h"
-#include "selectThreadImpl.h"
-
-#if defined(THREAD_DUMMY_IMPL)
-
-#include "mutexDummyImpl.h"
-typedef MutexDummyImpl MutexImpl;
-typedef MutexDummyImpl ReMutexImpl;
-#define HAVE_REMUTEXIMPL 1
-
-#elif defined(THREAD_WIN32_IMPL)
-
-#include "mutexWin32Impl.h"
-typedef MutexWin32Impl MutexImpl;
-typedef MutexWin32Impl ReMutexImpl;  // Win32 Mutexes are always reentrant.
-#define HAVE_REMUTEXIMPL 1
-
-#elif defined(THREAD_POSIX_IMPL)
-
-#include "mutexPosixImpl.h"
-typedef MutexPosixImpl MutexImpl;
-typedef ReMutexPosixImpl ReMutexImpl;
-#define HAVE_REMUTEXIMPL 1
-
-#elif defined(THREAD_NSPR_IMPL)
-
-#include "mutexNsprImpl.h"
-typedef MutexNsprImpl MutexImpl;
-#undef HAVE_REMUTEXIMPL  // NSPR doesn't provide a reentrant mutex.
-
-#endif
-
-#endif
-
-
-

panda/src/express/mutexNsprImpl.I

@@ -1,72 +0,0 @@
-// Filename: mutexNsprImpl.I
-// Created by:  drose (08Aug02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexNsprImpl::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE MutexNsprImpl::
-MutexNsprImpl() {
-  _lock = PR_NewLock();
-  nassertv(_lock != (PRLock *)NULL);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexNsprImpl::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE MutexNsprImpl::
-~MutexNsprImpl() {
-  PR_DestroyLock(_lock);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexNsprImpl::lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void MutexNsprImpl::
-lock() {
-  PR_Lock(_lock);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexNsprImpl::try_lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE bool MutexNsprImpl::
-try_lock() {
-  // NSPR doesn't define a try_lock function.  Too bad.  We just
-  // report that it would always block (since we don't know).
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexNsprImpl::release
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void MutexNsprImpl::
-release() {
-  int status = PR_Unlock(_lock);
-  nassertv(status == PR_SUCCESS);
-}

panda/src/express/mutexNsprImpl.cxx

@@ -1,25 +0,0 @@
-// Filename: mutexNsprImpl.cxx
-// Created by:  drose (09Aug02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#include "selectThreadImpl.h"
-
-#ifdef THREAD_NSPR_IMPL
-
-#include "mutexNsprImpl.h"
-
-#endif  // THREAD_NSPR_IMPL

panda/src/express/mutexNsprImpl.h

@@ -1,55 +0,0 @@
-// Filename: mutexNsprImpl.h
-// Created by:  drose (08Aug02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef MUTEXNSPRIMPL_H
-#define MUTEXNSPRIMPL_H
-
-#include "pandabase.h"
-#include "selectThreadImpl.h"
-
-#ifdef THREAD_NSPR_IMPL
-
-#include "notify.h"
-
-#include <prlock.h>
-
-#undef MUTEX_DEFINES_TRYLOCK
-
-////////////////////////////////////////////////////////////////////
-//       Class : MutexNsprImpl
-// Description : Uses NSPR to implement a mutex.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDAEXPRESS MutexNsprImpl {
-public:
-  INLINE MutexNsprImpl();
-  INLINE ~MutexNsprImpl();
-
-  INLINE void lock();
-  INLINE bool try_lock();
-  INLINE void release();
-
-private:
-  PRLock *_lock;
-  friend class ConditionVarNsprImpl;
-};
-
-#include "mutexNsprImpl.I"
-
-#endif  // THREAD_NSPR_IMPL
-
-#endif

panda/src/express/mutexPosixImpl.I

@@ -1,138 +0,0 @@
-// Filename: mutexPosixImpl.I
-// Created by:  drose (10Feb06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexPosixImpl::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE MutexPosixImpl::
-MutexPosixImpl() {
-  pthread_mutexattr_t attr;
-  pthread_mutexattr_init(&attr);
-  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
-  int result = pthread_mutex_init(&_lock, &attr);
-  pthread_mutexattr_destroy(&attr);
-  nassertv(result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexPosixImpl::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE MutexPosixImpl::
-~MutexPosixImpl() {
-  int result = pthread_mutex_destroy(&_lock);
-  nassertv(result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexPosixImpl::lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void MutexPosixImpl::
-lock() {
-  int result = pthread_mutex_lock(&_lock);
-  nassertv(result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexPosixImpl::try_lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE bool MutexPosixImpl::
-try_lock() {
-  int result = pthread_mutex_trylock(&_lock);
-  nassertr(result == 0 || result == EBUSY, false);
-  return (result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexPosixImpl::release
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void MutexPosixImpl::
-release() {
-  int result = pthread_mutex_unlock(&_lock);
-  nassertv(result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ReMutexPosixImpl::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ReMutexPosixImpl::
-ReMutexPosixImpl() {
-  pthread_mutexattr_t attr;
-  pthread_mutexattr_init(&attr);
-  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-  int result = pthread_mutex_init(&_lock, &attr);
-  pthread_mutexattr_destroy(&attr);
-  nassertv(result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ReMutexPosixImpl::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE ReMutexPosixImpl::
-~ReMutexPosixImpl() {
-  int result = pthread_mutex_destroy(&_lock);
-  nassertv(result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ReMutexPosixImpl::lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void ReMutexPosixImpl::
-lock() {
-  int result = pthread_mutex_lock(&_lock);
-  nassertv(result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ReMutexPosixImpl::try_lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE bool ReMutexPosixImpl::
-try_lock() {
-  int result = pthread_mutex_trylock(&_lock);
-  nassertr(result == 0 || result == EBUSY, false);
-  return (result == 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ReMutexPosixImpl::release
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void ReMutexPosixImpl::
-release() {
-  int result = pthread_mutex_unlock(&_lock);
-  nassertv(result == 0);
-}

panda/src/express/mutexPosixImpl.cxx

@@ -1,25 +0,0 @@
-// Filename: mutexPosixImpl.cxx
-// Created by:  drose (10Feb06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#include "selectThreadImpl.h"
-
-#ifdef THREAD_POSIX_IMPL
-
-#include "mutexPosixImpl.h"
-
-#endif  // THREAD_POSIX_IMPL

panda/src/express/mutexPosixImpl.h

@@ -1,73 +0,0 @@
-// Filename: mutexPosixImpl.h
-// Created by:  drose (10Feb06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef MUTEXPOSIXIMPL_H
-#define MUTEXPOSIXIMPL_H
-
-#include "pandabase.h"
-#include "selectThreadImpl.h"
-
-#ifdef THREAD_POSIX_IMPL
-
-#include "notify.h"
-
-#include <pthread.h>
-#include <errno.h>
-
-#define MUTEX_DEFINES_TRYLOCK 1
-
-////////////////////////////////////////////////////////////////////
-//       Class : MutexPosixImpl
-// Description : Uses Posix threads to implement a mutex.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDAEXPRESS MutexPosixImpl {
-public:
-  INLINE MutexPosixImpl();
-  INLINE ~MutexPosixImpl();
-
-  INLINE void lock();
-  INLINE bool try_lock();
-  INLINE void release();
-
-private:
-  pthread_mutex_t _lock;
-  friend class ConditionVarPosixImpl;
-};
-
-////////////////////////////////////////////////////////////////////
-//       Class : ReMutexPosixImpl
-// Description : Uses Posix threads to implement a reentrant mutex.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDAEXPRESS ReMutexPosixImpl {
-public:
-  INLINE ReMutexPosixImpl();
-  INLINE ~ReMutexPosixImpl();
-
-  INLINE void lock();
-  INLINE bool try_lock();
-  INLINE void release();
-
-private:
-  pthread_mutex_t _lock;
-};
-
-#include "mutexPosixImpl.I"
-
-#endif  // THREAD_POSIX_IMPL
-
-#endif

panda/src/express/mutexWin32Impl.I

@@ -1,68 +0,0 @@
-// Filename: mutexWin32Impl.I
-// Created by:  drose (07Feb06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexWin32Impl::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE MutexWin32Impl::
-MutexWin32Impl() {
-  InitializeCriticalSection(&_lock);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexWin32Impl::Destructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE MutexWin32Impl::
-~MutexWin32Impl() {
-  DeleteCriticalSection(&_lock);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexWin32Impl::lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void MutexWin32Impl::
-lock() {
-  EnterCriticalSection(&_lock);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexWin32Impl::try_lock
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE bool MutexWin32Impl::
-try_lock() {
-  return (TryEnterCriticalSection(&_lock) != 0);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: MutexWin32Impl::release
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void MutexWin32Impl::
-release() {
-  LeaveCriticalSection(&_lock);
-}

panda/src/express/mutexWin32Impl.cxx

@@ -1,25 +0,0 @@
-// Filename: mutexWin32Impl.cxx
-// Created by:  drose (07Feb06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#include "selectThreadImpl.h"
-
-#ifdef THREAD_WIN32_IMPL
-
-#include "mutexWin32Impl.h"
-
-#endif  // THREAD_WIN32_IMPL

panda/src/express/mutexWin32Impl.h

@@ -1,55 +0,0 @@
-// Filename: mutexWin32Impl.h
-// Created by:  drose (07Feb06)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef MUTEXWIN32IMPL_H
-#define MUTEXWIN32IMPL_H
-
-#include "pandabase.h"
-#include "selectThreadImpl.h"
-
-#ifdef THREAD_WIN32_IMPL
-
-#include "notify.h"
-
-#include <windows.h>
-
-#define MUTEX_DEFINES_TRYLOCK 1
-
-////////////////////////////////////////////////////////////////////
-//       Class : MutexWin32Impl
-// Description : Uses Windows native calls to implement a mutex.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDAEXPRESS MutexWin32Impl {
-public:
-  INLINE MutexWin32Impl();
-  INLINE ~MutexWin32Impl();
-
-  INLINE void lock();
-  INLINE bool try_lock();
-  INLINE void release();
-
-private:
-  CRITICAL_SECTION _lock;
-  friend class ConditionVarWin32Impl;
-};
-
-#include "mutexWin32Impl.I"
-
-#endif  // THREAD_WIN32_IMPL
-
-#endif

panda/src/express/selectThreadImpl.h

@@ -1,65 +0,0 @@
-// Filename: selectThreadImpl.h
-// Created by:  drose (09Aug02)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef SELECTTHREADIMPL_H
-#define SELECTTHREADIMPL_H
-
-#include "pandabase.h"
-
-////////////////////////////////////////////////////////////////////
-// This file decides which of the core implementations of the various
-// threading and locking implementations we should use, based on
-// platform and/or available libraries.
-////////////////////////////////////////////////////////////////////
-
-#if !defined(HAVE_THREADS)
-
-// With threading disabled, use the do-nothing implementation.
-#define THREAD_DUMMY_IMPL 1
-
-#elif defined(WIN32_VC)
-
-// In Windows, use the native threading library.
-#define THREAD_WIN32_IMPL 1
-
-#elif defined(HAVE_POSIX_THREADS)
-
-// Posix threads are nice.
-#define THREAD_POSIX_IMPL 1
-
-#elif defined(HAVE_NSPR)
-
-// If NSPR is available, use that.
-#define THREAD_NSPR_IMPL 1
-
-#else
-
-// This is a configuration error.  For some reason, HAVE_THREADS is
-// defined but we don't have any way to implement it.
-#error No thread implementation defined for platform.
-
-#endif
-
-// Let's also factor out some of the other configuration variables.
-#if defined(DO_PIPELINING) && defined(HAVE_THREADS)
-#define THREADED_PIPELINE 1
-#else
-#undef THREADED_PIPELINE
-#endif
-
-#endif