Merge branch 'HaxeFoundation:master' into patch-3

Author: MAJigsaw77

include/hx/StdLibs.h

@@ -43,6 +43,7 @@ Array<unsigned char> __hxcpp_resource_bytes(String inName);
 // System access
 Array<String>  __get_args();
 double         __time_stamp();
+::cpp::Int64   __time_stamp_ms();
 
 HXCPP_EXTERN_CLASS_ATTRIBUTES void __hxcpp_print_string(const String &inV);
 HXCPP_EXTERN_CLASS_ATTRIBUTES void __hxcpp_println_string(const String &inV);
@@ -472,16 +473,102 @@ inline void* _hx_atomic_compare_exchange_ptr(volatile void **a, void *expected,
 #elif defined(HX_MSVC_ATOMICS)
   return _InterlockedCompareExchangePointer((void *volatile *)a, replacement, expected);
 #else
-   void *old = *a;
-   *a = replacement;
-   return old;
+  void *old = *a;
+  if (old == expected) {
+    *a = replacement;
+  }
+  return old;
 #endif
 }
 
 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) {
+    Dynamic ptr = load();
+    HX_MARK_MEMBER(ptr);
+  }
+
+#ifdef HXCPP_VISIT_ALLOCS
+   void __Visit(hx::VisitContext *__inCtx) {
+     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);
+}
+
+inline Dynamic __hxcpp_atomic_object_store(Dynamic dynObj, Dynamic val) {
+  AtomicObject *obj = dynamic_cast<AtomicObject *>(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);
+  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);
+  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);
+  if (!obj)
+    throw HX_INVALID_OBJECT;
+  return obj->compareExchange(expected, replacement);
+}
+
 Array<String> __hxcpp_get_call_stack(bool inSkipLast);
 Array<String> __hxcpp_get_exception_stack();
 #define HXCPP_HAS_CLASSLIST

src/hx/StdLibs.cpp

@@ -242,8 +242,17 @@ int __hxcpp_irand(int inMax)
    return (lo | (mid<<12) | (hi<<24) ) % inMax;
 }
 
+#ifdef HX_WINDOWS
+LARGE_INTEGER qpcFrequency;
+#endif
+
 void __hxcpp_stdlibs_boot()
 {
+#ifdef HX_WINDOWS
+    // MSDN states that QueryPerformanceFrequency will always succeed on XP and above, so I'm ignoring the result.
+    QueryPerformanceFrequency(&qpcFrequency);
+#endif
+
    #if defined(_MSC_VER) && !defined(HX_WINRT)
    HMODULE kernel32 = LoadLibraryA("kernel32");
    if (kernel32)
@@ -327,10 +336,7 @@ double  __time_stamp()
       if (t0==0)
       {
          t0 = now;
-         __int64 freq;
-         QueryPerformanceFrequency((LARGE_INTEGER*)&freq);
-         if (freq!=0)
-            period = 1.0/freq;
+         period = 1.0/qpcFrequency.QuadPart;
       }
       if (period!=0)
          return (now-t0)*period;
@@ -349,6 +355,26 @@ double  __time_stamp()
 #endif
 }
 
+::cpp::Int64 __time_stamp_ms()
+{
+#ifdef HX_WINDOWS
+    // MSDN states that QueryPerformanceCounter will always succeed on XP and above, so I'm ignoring the result.
+    auto now = LARGE_INTEGER{ 0 };
+    QueryPerformanceCounter(&now);
+
+    return now.QuadPart * LONGLONG{ 1000 } / qpcFrequency.QuadPart;
+#else
+    auto time = timespec();
+
+    if (clock_gettime(CLOCK_MONOTONIC, &time))
+    {
+        throw ::Dynamic(HX_CSTRING("Failed to get the monotonic clock time"));
+    }
+
+    return time.tv_sec * 1000 + (time.tv_nsec / 1000000);
+#endif
+}
+
 #if defined(HX_WINDOWS) && !defined(HX_WINRT)
 
 /*

src/hx/gc/Immix.cpp

@@ -198,15 +198,13 @@ static bool sGcVerifyGenerational = false;
   #else
   enum { MAX_GC_THREADS = 2 };
   #endif
+  
+  // You can uncomment this for better call stacks if it crashes while collecting
+  #define HX_MULTI_THREAD_MARKING
 #else
   enum { MAX_GC_THREADS = 1 };
 #endif
 
-#if (MAX_GC_THREADS>1)
-   // You can uncomment this for better call stacks if it crashes while collecting
-   #define HX_MULTI_THREAD_MARKING
-#endif
-
 #ifdef PROFILE_THREAD_USAGE
 static int sThreadMarkCountData[MAX_GC_THREADS+1];
 static int sThreadArrayMarkCountData[MAX_GC_THREADS+1];
@@ -1952,7 +1950,7 @@ class MarkContext
              if (obj)
              {
                 obj->__Mark(this);
-                #if HX_MULTI_THREAD_MARKING
+                #ifdef HX_MULTI_THREAD_MARKING
                 // Load balance
                 if (sLazyThreads && marking->count>32)
                 {

src/hx/libs/zlib/Build.xml

@@ -13,10 +13,6 @@
   <compilerflag value="-DSTDC" unless="windows" />
   <compilerflag value="-DHAVE_UNISTD_H" unless="windows" />
 
-  <compilerflag value="-Wno-unknown-warning" unless="MSVC_VER" />
-  <compilerflag value="-Wno-unknown-warning-option" unless="MSVC_VER" />
-  <compilerflag value="-Wno-deprecated-non-prototype" unless="MSVC_VER" />
-
   <file name="ZLib.cpp"/>
 
   <!-- HXCPP_LINK_NO_ZLIB may be set too late, so use filterout as well. -->