Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 05:13:46 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
RobertoFresca 2016-03-21 22:46:57 -03:00
commit d500e6a5fa
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -31,7 +31,7 @@
!/makefile !/makefile
!/mame.doxygen !/mame.doxygen
!/*.md !/*.md
!/*.bdc !/*.bdf
!/LICENSE !/LICENSE
/.idea /.idea
regtests/chdman/temp regtests/chdman/temp

9
src/lib/netlist/nl_lists.h
View File

@ -13,6 +13,9 @@
#include "nl_config.h" #include "nl_config.h"
#include "plib/plists.h" #include "plib/plists.h"
#include <atomic>
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// timed queue // timed queue
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
@ -62,7 +65,7 @@ namespace netlist
{ {
#if HAS_OPENMP && USE_OPENMP #if HAS_OPENMP && USE_OPENMP
/* Lock */ /* Lock */
while (atomic_exchange32(&m_lock, 1)) { } while (m_lock.exchange(1)) { }
#endif #endif
const _Time &t = e.exec_time(); const _Time &t = e.exec_time();
entry_t * i = m_end++; entry_t * i = m_end++;
@ -94,7 +97,7 @@ namespace netlist
{ {
/* Lock */ /* Lock */
#if HAS_OPENMP && USE_OPENMP #if HAS_OPENMP && USE_OPENMP
while (atomic_exchange32(&m_lock, 1)) { } while (m_lock.exchange(1)) { }
#endif #endif
for (entry_t * i = m_end - 1; i > &m_list[0]; i--) for (entry_t * i = m_end - 1; i > &m_list[0]; i--)
{ {
@ -143,7 +146,7 @@ namespace netlist
private: private:
#if HAS_OPENMP && USE_OPENMP #if HAS_OPENMP && USE_OPENMP
volatile INT32 m_lock; volatile std::atomic<int> m_lock;
#endif #endif
entry_t * m_end; entry_t * m_end;
parray_t<entry_t> m_list; parray_t<entry_t> m_list;