Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 7 additions & 57 deletions include/hx/StdLibs.h
Original file line number Diff line number Diff line change
Expand Up @@ -491,89 +491,39 @@ inline void* _hx_atomic_compare_exchange_ptr(volatile void **a, void *expected,
#endif
}

#include "hx/atomic/AtomicObject.hpp"

inline void* _hx_atomic_compare_exchange_cast_ptr(void *a, void *expected, void *replacement) {
return _hx_atomic_compare_exchange_ptr((volatile void **)a, expected, replacement);
}

#include <atomic>

struct AtomicObject: hx::Object {
std::atomic< ::hx::Object *> aPtr;

AtomicObject(Dynamic val) { aPtr = val.mPtr; }

void __Mark(hx::MarkContext *__inCtx) HXCPP_OVERRIDE {
Dynamic ptr = load();
HX_MARK_MEMBER(ptr);
}

#ifdef HXCPP_VISIT_ALLOCS
void __Visit(hx::VisitContext *__inCtx) HXCPP_OVERRIDE {
hx::Object *obj = aPtr.load();
HX_VISIT_MEMBER(obj);
aPtr.store(obj);
}
#endif

Dynamic store(Dynamic val) {
aPtr.store(val.mPtr);
HX_OBJ_WB_GET(this, val.mPtr);
return val;
}

Dynamic load() {
return aPtr.load();
}

Dynamic exchange(Dynamic val) {
Dynamic ret = aPtr.exchange(val.mPtr);
HX_OBJ_WB_GET(this, val.mPtr);
return ret;
}

Dynamic compareExchange(Dynamic expected, Dynamic replacement) {
// Note: using Dynamic instead of hx::Object* is important
// Dynamic has an overloaded == operator, a raw pointer to hx::Object does not.
Dynamic original = aPtr.load();
while (original == expected) {
if (aPtr.compare_exchange_weak(original.mPtr, replacement.mPtr)) {
HX_OBJ_WB_GET(this, replacement.mPtr);
return original;
} else {
continue;
}
}
return original;
}
};

inline Dynamic __hxcpp_atomic_object_create(Dynamic value) {
return new AtomicObject(value);
return new hx::atomic::AtomicObject_obj(value);
}

inline Dynamic __hxcpp_atomic_object_store(Dynamic dynObj, Dynamic val) {
AtomicObject *obj = dynamic_cast<AtomicObject *>(dynObj.mPtr);
hx::atomic::AtomicObject_obj* obj{ dynamic_cast<hx::atomic::AtomicObject_obj*>(dynObj.mPtr) };
if (!obj)
throw HX_INVALID_OBJECT;
return obj->store(val);
}

inline Dynamic __hxcpp_atomic_object_load(Dynamic dynObj) {
AtomicObject *obj = dynamic_cast<AtomicObject *>(dynObj.mPtr);
hx::atomic::AtomicObject_obj* obj{ dynamic_cast<hx::atomic::AtomicObject_obj*>(dynObj.mPtr) };
if (!obj)
throw HX_INVALID_OBJECT;
return obj->load();
}

inline Dynamic __hxcpp_atomic_object_exchange(Dynamic dynObj, Dynamic newVal) {
AtomicObject *obj = dynamic_cast<AtomicObject *>(dynObj.mPtr);
hx::atomic::AtomicObject_obj* obj{ dynamic_cast<hx::atomic::AtomicObject_obj*>(dynObj.mPtr) };
if (!obj)
throw HX_INVALID_OBJECT;
return obj->exchange(newVal);
}

inline Dynamic __hxcpp_atomic_object_compare_exchange(Dynamic dynObj, Dynamic expected, Dynamic replacement) {
AtomicObject *obj = dynamic_cast<AtomicObject *>(dynObj.mPtr);
hx::atomic::AtomicObject_obj* obj{ dynamic_cast<hx::atomic::AtomicObject_obj*>(dynObj.mPtr) };
if (!obj)
throw HX_INVALID_OBJECT;
return obj->compareExchange(expected, replacement);
Expand Down
33 changes: 33 additions & 0 deletions include/hx/atomic/AtomicInt.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#pragma once

#ifndef HXCPP_H
#include <hxcpp.h>
#endif

HX_DECLARE_CLASS2(hx, atomic, AtomicInt)

namespace hx
{
namespace atomic
{
struct AtomicInt_obj final : public hx::Object
{
AtomicInt_obj(int val);

int fetchAdd(int val);
int fetchSub(int val);
int fetchAnd(int val);
int fetchXor(int val);
int fetchOr(int val);
int store(int val);
int load();
int exchange(int val);
int compareExchange(int expected, int replacement);

private:
struct Impl;

Impl* impl;
};
}
}
33 changes: 33 additions & 0 deletions include/hx/atomic/AtomicObject.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#pragma once

#ifndef HXCPP_H
#include <hxcpp.h>
#endif

HX_DECLARE_CLASS2(hx, atomic, AtomicObject)

namespace hx
{
namespace atomic
{
struct AtomicObject_obj final : public hx::Object
{
AtomicObject_obj(Dynamic val);

void __Mark(hx::MarkContext* __inCtx) HXCPP_OVERRIDE;
#ifdef HXCPP_VISIT_ALLOCS
void __Visit(hx::VisitContext* __inCtx) HXCPP_OVERRIDE;
#endif

Dynamic store(Dynamic val);
Dynamic load();
Dynamic exchange(Dynamic val);
Dynamic compareExchange(Dynamic expected, Dynamic replacement);

private:
struct Impl;

Impl* impl;
};
}
}
91 changes: 91 additions & 0 deletions src/hx/atomic/AtomicInt.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
#include <hxcpp.h>
#include "hx/atomic/AtomicInt.hpp"
#include <atomic>

struct hx::atomic::AtomicInt_obj::Impl
{
std::atomic_int atomic;
};

hx::atomic::AtomicInt_obj::AtomicInt_obj(int val) : impl(new Impl())
{
impl->atomic.store(val);
}

int hx::atomic::AtomicInt_obj::fetchAdd(int val)
{
hx::AutoGCFreeZone _;

return impl->atomic.fetch_add(val);
}

int hx::atomic::AtomicInt_obj::fetchSub(int val)
{
hx::AutoGCFreeZone _;

return impl->atomic.fetch_sub(val);
}

int hx::atomic::AtomicInt_obj::fetchAnd(int val)
{
hx::AutoGCFreeZone _;

return impl->atomic.fetch_and(val);
}

int hx::atomic::AtomicInt_obj::fetchXor(int val)
{
hx::AutoGCFreeZone _;

return impl->atomic.fetch_xor(val);
}

int hx::atomic::AtomicInt_obj::fetchOr(int val)
{
hx::AutoGCFreeZone _;

return impl->atomic.fetch_or(val);
}

int hx::atomic::AtomicInt_obj::store(int val)
{
hx::AutoGCFreeZone _;

impl->atomic.store(val);

return val;
}

int hx::atomic::AtomicInt_obj::load()
{
hx::AutoGCFreeZone _;

return impl->atomic.load();
}

int hx::atomic::AtomicInt_obj::exchange(int val)
{
hx::AutoGCFreeZone _;

return impl->atomic.exchange(val);
}

int hx::atomic::AtomicInt_obj::compareExchange(int expected, int replacement)
{
hx::AutoGCFreeZone _;

int original{ impl->atomic.load() };
while (original == expected)
{
if (impl->atomic.compare_exchange_strong(expected, replacement))
{
return original;
}
else
{
continue;
}
}

return original;
}
88 changes: 88 additions & 0 deletions src/hx/atomic/AtomicObject.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
#include <hxcpp.h>
#include "hx/atomic/AtomicObject.hpp"
#include <atomic>

struct hx::atomic::AtomicObject_obj::Impl
{
std::atomic<hx::Object*> atomic;
};

hx::atomic::AtomicObject_obj::AtomicObject_obj(Dynamic val) : impl(new Impl())
{
impl->atomic.store(val.mPtr);

HX_OBJ_WB_NEW_MARKED_OBJECT(this);
}

void hx::atomic::AtomicObject_obj::__Mark(HX_MARK_PARAMS)
{
Dynamic ptr{ impl->atomic.load() };

HX_MARK_MEMBER(ptr);
}

#ifdef HXCPP_VISIT_ALLOCS
void hx::atomic::AtomicObject_obj::__Visit(HX_VISIT_PARAMS)
{
Dynamic ptr{ impl->atomic.load() };

HX_VISIT_MEMBER(ptr);

impl->atomic.store(ptr);
}
#endif

Dynamic hx::atomic::AtomicObject_obj::store(Dynamic val)
{
hx::EnterGCFreeZone();
impl->atomic.store(val);
hx::ExitGCFreeZone();

HX_OBJ_WB_GET(this, val.mPtr);

return val;
}

Dynamic hx::atomic::AtomicObject_obj::load()
{
hx::AutoGCFreeZone _;

return impl->atomic.load();
}

Dynamic hx::atomic::AtomicObject_obj::exchange(Dynamic val)
{
hx::EnterGCFreeZone();
Dynamic old{ impl->atomic.exchange(val) };
hx::ExitGCFreeZone();

HX_OBJ_WB_GET(this, val.mPtr);

return old;
}

Dynamic hx::atomic::AtomicObject_obj::compareExchange(Dynamic expected, Dynamic replacement)
{
// Note: using Dynamic instead of hx::Object* is important
// Dynamic has an overloaded == operator, a raw pointer to hx::Object does not.
Dynamic original{ impl->atomic.load() };
while (original == expected)
{
hx::EnterGCFreeZone();
if (impl->atomic.compare_exchange_strong(original.mPtr, replacement.mPtr))
{
hx::ExitGCFreeZone();

HX_OBJ_WB_GET(this, replacement.mPtr);

return original;
}
else
{
hx::ExitGCFreeZone();
continue;
}
}

return original;
}
4 changes: 4 additions & 0 deletions toolchain/haxe-target-atomic.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<xml>
<file name="src/hx/atomic/AtomicObject.cpp"/>
<file name="src/hx/atomic/AtomicInt.cpp"/>
</xml>
4 changes: 4 additions & 0 deletions toolchain/haxe-target.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<!-- Use value from Build.xml file unless one is specified from the haxe defines -->
<set name="hxcpp_api_level" value="${HXCPP_API_LEVEL}" unless="hxcpp_api_level" if="HXCPP_API_LEVEL" />
<set name="HXCPP_THREAD_XML" value="${HXCPP}/toolchain/haxe-target-threads.xml" unless="HXCPP_THREAD_XML"/>
<set name="HXCPP_ATOMIC_XML" value="${HXCPP}/toolchain/haxe-target-atomic.xml" unless="HXCPP_ATOMIC_XML"/>

<!-- You can override the exes an "exe" section on your own .hxcpp_config -->
<!-- You can use replace="1" to change the compiler, or omit to add flags -->
Expand Down Expand Up @@ -81,6 +82,8 @@
<depend name="${HXCPP}/include/hx/thread/Thread.hpp"/>
<depend name="${HXCPP}/include/hx/thread/ThreadLocal.hpp"/>
<depend name="${HXCPP}/include/hx/thread/Scratch.hpp"/>
<depend name="${HXCPP}/include/hx/atomic/AtomicInt.hpp"/>
<depend name="${HXCPP}/include/hx/atomic/AtomicObject.hpp"/>
<section unless="HXCPP_LINK_NO_TOOL_DEPENDS" >
<depend name="${HXCPP}/toolchain/haxe-target.xml" dateOnly="true" />
<depend name="${HXCPP}/toolchain/${toolchain}-toolchain.xml" ifExists="${HXCPP}/toolchain/${toolchain}-toolchain.xml" dateOnly="true" />
Expand Down Expand Up @@ -211,6 +214,7 @@
<file name = "src/cpp/encoding/Encodings.cpp" />

<include name="${HXCPP_THREAD_XML}"/>
<include name="${HXCPP_ATOMIC_XML}"/>

<addTwice if="linux||android" />
<cache value="1" project="hxcpp_runtime" asLibrary="true" />
Expand Down
Loading