midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4157 from FearlessTobi/port-1048

Browse Source 
Port #1048 from yuzu: "kernel/object: Tighten object against data races"
This commit is contained in:
Merry 2018-09-02 09:54:49 +01:00 committed by GitHub
commit f1b8d091db
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

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

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

@ -4,6 +4,7 @@
#pragma once
#include <atomic>
#include <string>
#include <utility>
@ -48,8 +49,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 {
@ -67,23 +68,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;
}
}