franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1048 from lioncash/atomic 

kernel/object: Tighten object against data races
This commit is contained in:
bunnei 2018-08-13 01:41:23 -04:00 committed by GitHub
parent baaafbd5ea 3476f5b4d3
commit 2e89719d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/kernel/kernel.cpp
View File

@ -11,7 +11,7 @@
namespace Kernel {
unsigned int Object::next_object_id;
std::atomic<u32> Object::next_object_id{0};
/// Initialize the kernel
void Init() {

15
src/core/hle/kernel/object.h
View File

@ -4,6 +4,7 @@
#pragma once
#include <atomic>
#include <string>
#include <utility>
@ -42,8 +43,8 @@ public:
virtual ~Object();
/// Returns a unique identifier for the object. For debugging purposes only.
unsigned int GetObjectId() const {
return object_id;
u32 GetObjectId() const {
return object_id.load(std::memory_order_relaxed);
}
virtual std::string GetTypeName() const {
@ -61,23 +62,23 @@ public:
bool IsWaitable() const;
public:
static unsigned int next_object_id;
static std::atomic<u32> next_object_id;
private:
friend void intrusive_ptr_add_ref(Object*);
friend void intrusive_ptr_release(Object*);
unsigned int ref_count = 0;
unsigned int object_id = next_object_id++;
std::atomic<u32> ref_count{0};
std::atomic<u32> object_id{next_object_id++};
};
// Special functions used by boost::instrusive_ptr to do automatic ref-counting
inline void intrusive_ptr_add_ref(Object* object) {
++object->ref_count;
object->ref_count.fetch_add(1, std::memory_order_relaxed);
}
inline void intrusive_ptr_release(Object* object) {
if (--object->ref_count == 0) {
if (object->ref_count.fetch_sub(1, std::memory_order_acq_rel) == 1) {
delete object;
}
}