Bug 757375: concurrency changes, shared ByteArray, Mutex, and Conditions are disabled temporarily for Dolores (p=jasowill,r=dtomack)
authorDan Schaffer <Dan.Schaffer@adobe.com>
Fri, 17 Aug 2012 08:06:58 -0700
changeset 7529 9190d6ad28a1611be018bace892214fd7b8f7380
parent 7528 cbe55af57d881b2b024ab95de3093141063dd1c2
child 7530 c819efba769f1fbb196630fb1529a20f4d134d9c
push id4256
push userdschaffe@adobe.com
push dateMon, 20 Aug 2012 13:10:53 +0000
reviewersdtomack
bugs757375, 1099381, 1101475
Bug 757375: concurrency changes, shared ByteArray, Mutex, and Conditions are disabled temporarily for Dolores (p=jasowill,r=dtomack) integrate CL 1099381 CL@1101475
core/ByteArrayGlue.cpp
core/ByteArrayGlue.h
core/concurrent.as
--- a/core/ByteArrayGlue.cpp
+++ b/core/ByteArrayGlue.cpp
@@ -1478,23 +1478,23 @@ namespace avmplus
         return vmbase::AtomicOps::compareAndSwap32WithBarrierPrev(expected, next, (int32_t*)wordptr);
     }
 
     bool ByteArray::isWorkerLocal()
     {
         return m_workerLocal;
     }
 
-    bool ByteArray::setWorkerLocal(bool flag)
+    bool ByteArray::setWorkerLocal(bool value)
     {
-        if (m_workerLocal == flag)
+        if (m_workerLocal == value)
             return false; // no change.
-        if (m_workerLocal == false && flag == true)
+        if (m_workerLocal == false && value == true)
             return false; // FIXME can't 'localize' yet. No change
-        m_workerLocal = flag;
+        m_workerLocal = value;
         return true;  // changed.
     }
     
     
     //
     // ByteArrayObject
     //
     
--- a/core/ByteArrayGlue.h
+++ b/core/ByteArrayGlue.h
@@ -159,17 +159,17 @@ namespace avmplus
         // overrides from DataInput
         /*virtual*/ uint32_t Available() { return (m_position <= m_buffer->length) ? (m_buffer->length - m_position) : 0; }
         /*virtual*/ void Read(void* buffer, uint32_t count);
 
         // overrides from DataOutput
         /*virtual*/ void Write(const void* buffer, uint32_t count);
 
         bool isWorkerLocal();
-        bool setWorkerLocal(bool flag);
+        bool setWorkerLocal(bool value);
         
              
         bool addSubscriber(DomainEnv* subscriber);
         bool removeSubscriber(DomainEnv* subscriber);
 
         // compression / decompression
         enum CompressionAlgorithm
         {
--- a/core/concurrent.as
+++ b/core/concurrent.as
@@ -367,28 +367,26 @@ final public class Condition
 	private static const kConditionCannotNotifyError:uint = 1516;
 	private static const kConditionCannotNotifyAllError:uint = 1517;
 }
 }
 
 package avm2.intrinsics.memory
 {
     /**
-     * @private
      * A complete memory barrier for domainMemory (for both load and store instructions).
      *
      * @langversion 3.0
      * @playerversion Flash 11.4	
      * @playerversion AIR 3.4
      */
 	[API(CONFIG::SWF_17)]
 	[native("ConcurrentMemory::mfence")]
 	public native function mfence():void;
     /**
-     * @private
      * A compare and swap for domainMemory.
      * Behaves like ByteArray.atomicCompareAndSwapIntAt but operates on the current domainMemory.
      *
      * @langversion 3.0
      * @playerversion Flash 11.4	
      * @playerversion AIR 3.4
      */
 	[API(CONFIG::SWF_17)]