Attachment #2202 for bug #1764

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

(-)a/src/core/model/system-mutex.h (-1 / +33 lines)

Lines 58-63	Link Here

class SystemMutex

class SystemMutex

public:

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 ();

  ~SystemMutex ();

  ~SystemMutex ();

Lines 74-79	Link Here

private:

private:

  /** The (system-dependent) implementation. */

  /** The (system-dependent) implementation. */

  SystemMutexPrivate * m_priv;

  SystemMutexPrivate * m_priv;

#endif /* HAVE_PTHREAD_H */

};

};

/**

/**

Lines 118-123	Link Here

118

class CriticalSection

132

class CriticalSection

119

133

120

public:

134

public:

135

136

#ifndef HAVE_PTHREAD_H

137

  // This minimal implementation is needed for to support compilation

138

  // of the thread-safe Schedule implementation, on systems without

139

  // thread support.

140

141

/**

142

   * Constructor

143

   * @param [in] mutex The mutex.

144

*/

145

  CriticalSection (SystemMutex &mutex) { };

146

  /** Destructor */

147

  ~CriticalSection () { };

148

149

#else /* HAVE_PTHREAD_H */

121

/**

150

/**

122

   * Construct with the required SystemMutex.

151

   * Construct with the required SystemMutex.

123

152

Lines 128-134	Link Here

128

  ~CriticalSection ();

157

  ~CriticalSection ();

129

private:

158

private:

130

  SystemMutex &m_mutex;  /**< The mutex. */

159

  SystemMutex &m_mutex;  /**< The mutex. */

131

};

160

161

#endif /* HAVE_PTHREAD_H */

162

163

};  // class CriticalSection

132

164

133

} // namespace ns3

165

} // namespace ns3

134

166




{
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/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