Skip to content

Commit

Permalink
Implement waitable atomics
Browse files Browse the repository at this point in the history
Moved Atomic.h to util/atomic.hpp
List source files in CMakeLists.txt
  • Loading branch information
Nekotekina committed Jul 26, 2019
1 parent ff9718a commit 0d0c0ff
Show file tree
Hide file tree
Showing 25 changed files with 618 additions and 69 deletions.
2 changes: 1 addition & 1 deletion Utilities/AtomicPtr.h
@@ -1,6 +1,6 @@
#pragma once

#include "Atomic.h"
#include "util/atomic.hpp"
#include <memory>
#include <cstddef>

Expand Down
2 changes: 1 addition & 1 deletion Utilities/Log.h
@@ -1,7 +1,7 @@
#pragma once

#include "types.h"
#include "Atomic.h"
#include "util/atomic.hpp"
#include "StrFmt.h"
#include <climits>

Expand Down
2 changes: 1 addition & 1 deletion Utilities/Thread.h
@@ -1,7 +1,7 @@
#pragma once

#include "types.h"
#include "Atomic.h"
#include "util/atomic.hpp"

#include <string>
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion Utilities/bit_set.h
Expand Up @@ -22,7 +22,7 @@ Intersection (&) and symmetric difference (^) is also available.
*/

#include "types.h"
#include "Atomic.h"
#include "util/atomic.hpp"

template <typename T>
class atomic_bs_t;
Expand Down
2 changes: 1 addition & 1 deletion Utilities/cond.h
@@ -1,7 +1,7 @@
#pragma once

#include "types.h"
#include "Atomic.h"
#include "util/atomic.hpp"
#include <shared_mutex>
#include "asm.h"

Expand Down
2 changes: 1 addition & 1 deletion Utilities/event.h
Expand Up @@ -4,7 +4,7 @@
#include <deque>
#include <list>

#include "Atomic.h"
#include "util/atomic.hpp"

template <typename T, T Mod = T::__state_enum_max, typename Under = std::underlying_type_t<T>>
T operator ++(T& value, int)
Expand Down
2 changes: 1 addition & 1 deletion Utilities/lockless.h
@@ -1,7 +1,7 @@
#pragma once

#include "types.h"
#include "Atomic.h"
#include "util/atomic.hpp"

//! Simple sizeless array base for concurrent access. Cannot shrink, only growths automatically.
//! There is no way to know the current size. The smaller index is, the faster it's accessed.
Expand Down
2 changes: 1 addition & 1 deletion Utilities/mutex.h
Expand Up @@ -2,7 +2,7 @@

#include <mutex>
#include "types.h"
#include "Atomic.h"
#include "util/atomic.hpp"

// Shared mutex with small size (u32).
class shared_mutex final
Expand Down
2 changes: 1 addition & 1 deletion Utilities/sema.h
Expand Up @@ -2,7 +2,7 @@

#include <mutex>
#include "types.h"
#include "Atomic.h"
#include "util/atomic.hpp"

// Lightweight semaphore helper class
class semaphore_base
Expand Down
2 changes: 1 addition & 1 deletion Utilities/sync.h
Expand Up @@ -3,7 +3,7 @@
/* For internal use. Don't include. */

#include "types.h"
#include "Atomic.h"
#include "util/atomic.hpp"
#include "dynamic_library.h"

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion Utilities/typemap.h
Expand Up @@ -3,7 +3,7 @@
#include "types.h"
#include "mutex.h"
#include "cond.h"
#include "Atomic.h"
#include "util/atomic.hpp"
#include "VirtualMemory.h"
#include <memory>

Expand Down
17 changes: 16 additions & 1 deletion rpcs3/CMakeLists.txt
Expand Up @@ -35,7 +35,22 @@ include(${CMAKE_SOURCE_DIR}/3rdparty/qt5.cmake)
add_subdirectory(Emu)
add_subdirectory(rpcs3qt)

file(GLOB RPCS3_SRC "*.cpp")
set(RPCS3_SRC
basic_keyboard_handler.cpp
basic_mouse_handler.cpp
ds3_pad_handler.cpp
ds4_pad_handler.cpp
evdev_joystick_handler.cpp
keyboard_pad_handler.cpp
main.cpp
mm_joystick_handler.cpp
pad_thread.cpp
rpcs3_app.cpp
rpcs3_version.cpp
stb_image.cpp
stdafx.cpp
xinput_pad_handler.cpp
)

if(WIN32)
add_executable(rpcs3 WIN32 ${RPCS3_SRC})
Expand Down

0 comments on commit 0d0c0ff

Please sign in to comment.