Attachment #2203 for bug #1764

View | Details | Raw Unified | Return to bug 1764
Collapse All | Expand All




#define SYSTEM_MUTEX_H

#include "ptr.h"
#include "ns3/core-config.h"

/**
 * @file

class SystemMutex 
{
public:

#ifndef HAVE_PTHREAD_H
  // This minimal implementation is needed for to support compilation
  // of the thread-safe Schedule implementation, on systems without
  // thread support.
  
  /** Constructor */
  SystemMutex () { };
  /** Destructor */
  ~SystemMutex () { };

#else
  SystemMutex ();
  ~SystemMutex ();


private:
  /** The (system-dependent) implementation. */
  SystemMutexPrivate * m_priv;

#endif /* HAVE_PTHREAD_H */
};

/**

class CriticalSection
{
public:

#ifndef HAVE_PTHREAD_H
  // This minimal implementation is needed for to support compilation
  // of the thread-safe Schedule implementation, on systems without
  // thread support.

  /**
   * Constructor
   * @param [in] mutex The mutex.
   */
  CriticalSection (SystemMutex &mutex) { };
  /** Destructor */
  ~CriticalSection () { };

#else /* HAVE_PTHREAD_H */
  /**
   * Construct with the required SystemMutex.
   *

  ~CriticalSection ();
private:
  SystemMutex &m_mutex;  /**< The mutex. */

#endif /* HAVE_PTHREAD_H */

};  // class CriticalSection

} // namespace ns3





{
public:

#ifndef HAVE_PTHREAD_H
  // This minimal implementation is needed for to support compilation
  // of the thread-safe Schedule implementation, on systems without
  // thread support.

  /**
   * Fallback type alias for thread objects
   * on systems without thread support.
   */
  typedef void * ThreadId;

  /**
   * @brief Returns the default thread Id on systems without thread support.
   *
   * @returns Default thread Id. 
   */
  static ThreadId Self(void) { return 0; };

  /**
   * @brief Compares ThreadIds on systems without thread support.
   *
   * @param [in] id The ThreadId to compare to.
   * @returns @c true if @c id matches the current ThreadId.
   */
  static bool Equals(ThreadId id) { return true; };
  
#else /* HAVE_PTHREAD_H */
  /** Type alias for the system-dependent thread object. */
  typedef pthread_t ThreadId;
#endif

  /**
   * @brief Create a SystemThread object.

  static bool Equals(ThreadId id);

private:

  /**
   * Invoke the callback in the new thread.
   *


  Callback<void> m_callback;  /**< The main function for this thread when launched. */
  pthread_t m_thread;  /**< The thread id of the child thread. */

#endif /* HAVE_PTHREAD_H */
};  // class SystemThread

} // namespace ns3


(-)a/src/core/model/unix-system-mutex.cc (+5 lines)

Lines 106-111	Link Here

106

107

108

109

#ifdef HAVE_PTHREAD_H

110

109

SystemMutex::SystemMutex()

111

SystemMutex::SystemMutex()

110

  : m_priv (new SystemMutexPrivate ())

112

  : m_priv (new SystemMutexPrivate ())

111

113

Lines 145-148	Link Here

145

  m_mutex.Unlock ();

147

  m_mutex.Unlock ();

146

148

147

149

150

#endif /* SYSTEM_MUTEX_H */

151

152

148

} // namespace ns3

153

} // namespace ns3

(-)a/src/core/wscript (-2 / +12 lines)

Lines 236-241	Link Here

236

        'model/watchdog.h',

236

        'model/watchdog.h',

237

        'model/synchronizer.h',

237

        'model/synchronizer.h',

238

        'model/make-event.h',

238

        'model/make-event.h',

239

240

        # Include always for compilation

241

        # of the thread-safe Schedule implementation,

242

        # even on systems without thread support.

243

        'model/system-mutex.h',

244

        'model/system-thread.h',

245

239

        'model/system-wall-clock-ms.h',

246

        'model/system-wall-clock-ms.h',

240

        'model/empty.h',

247

        'model/empty.h',

241

        'model/callback.h',

248

        'model/callback.h',

Lines 350-357	Link Here

350

        core_test.source.extend(['test/threaded-test-suite.cc'])

357

        core_test.source.extend(['test/threaded-test-suite.cc'])

351

        headers.source.extend([

358

        headers.source.extend([

352

                'model/unix-fd-reader.h',

359

                'model/unix-fd-reader.h',

353

                'model/system-mutex.h',

360

                # Include always for compilation

354

                'model/system-thread.h',

361

                # of the thread-safe Schedule implementation,

362

                # on systems without thread support.

363

                # 'model/system-mutex.h',

364

                # 'model/system-thread.h',

355

                'model/system-condition.h',

365

                'model/system-condition.h',

356

])

366

])

357

367

Return to bug 1764