Improve performance of new operator.

dim-s · dim-s · commit e47231b561fe · 2020-03-09T22:41:07.000+03:00
diff --git a/exts/jphp-json-ext/src/main/java/org/develnext/jphp/json/gson/MemoryDeserializer.java b/exts/jphp-json-ext/src/main/java/org/develnext/jphp/json/gson/MemoryDeserializer.java
@@ -66,7 +66,7 @@ else if (jsonPrimitive.isNumber()) {
         } else if (json.isJsonObject()) {
             JsonObject jsonObject = json.getAsJsonObject();
             StdClass stdClass = assoc ? null : new StdClass(env.get());
-            ArrayMemory array = assoc ? new ArrayMemory() : stdClass.getProperties();
+            ArrayMemory array = assoc ? new ArrayMemory() : stdClass.getPropertiesForChange();
 
             for(Map.Entry<String, JsonElement> el : jsonObject.entrySet()){
                 String key = el.getKey();
diff --git a/exts/jphp-zend-ext/src/main/java/org/develnext/jphp/zend/ext/standard/date/DateInterval.java b/exts/jphp-zend-ext/src/main/java/org/develnext/jphp/zend/ext/standard/date/DateInterval.java
@@ -334,6 +334,7 @@ private void min2Digit(StringBuilder buff, long years) {
     @Override
     public ArrayMemory getProperties() {
         ArrayMemory props = super.getProperties();
+        props.checkCopied();
 
         props.putAsKeyString("y", y);
         props.putAsKeyString("m", m);
diff --git a/exts/jphp-zend-ext/src/main/java/org/develnext/jphp/zend/ext/standard/date/DatePeriod.java b/exts/jphp-zend-ext/src/main/java/org/develnext/jphp/zend/ext/standard/date/DatePeriod.java
@@ -63,7 +63,6 @@ public static Memory __set_state(Environment env, TraceInfo traceInfo, Memory ar
         datePeriod.end = array.refOfIndex(traceInfo, "end");
         datePeriod.current = array.refOfIndex(traceInfo, "current");
 
-
         return new ObjectMemory(datePeriod);
     }
 
diff --git a/exts/jphp-zend-ext/src/main/java/org/develnext/jphp/zend/ext/standard/date/DateTimeZone.java b/exts/jphp-zend-ext/src/main/java/org/develnext/jphp/zend/ext/standard/date/DateTimeZone.java
@@ -51,10 +51,13 @@ public class DateTimeZone extends BaseObject {
     @Property
     public static final int PER_COUNTRY = 4096;
     private static final Memory ZERO_OFFSET = StringMemory.valueOf("+00:00");
-    @Property("timezone")
-    Memory timezone = Memory.UNDEFINED;
+
     @Property("timezone_type")
     Memory type = Memory.UNDEFINED;
+
+    @Property("timezone")
+    Memory timezone = Memory.UNDEFINED;
+
     private ZoneId nativeZone;
 
     public DateTimeZone(Environment env) {
@@ -131,7 +134,8 @@ public Memory __construct(Environment env, TraceInfo traceInfo, StringMemory arg
             env.exception(traceInfo, Messages.ERR_TIMEZONE_NULL_BYTE, "DateTimeZone::__construct()");
         }
         init(zone);
-        return new ObjectMemory(this);
+        getProperties();
+        return ObjectMemory.valueOf(this);
     }
 
     private void init(String zone) {
@@ -177,13 +181,15 @@ public Memory getTransitions(Environment env, TraceInfo traceInfo) {
     @Override
     public ArrayMemory getProperties() {
         ArrayMemory props = super.getProperties();
-        props.refOfIndex("timezone_type").assign(type);
+
         if (type.toInteger() == 1) {
             props.refOfIndex("timezone").assign(nativeZone.toString());
         } else {
             props.refOfIndex("timezone").assign(timezone);
         }
 
+        props.refOfIndex("timezone_type").assign(type);
+
         return props;
     }
 }
diff --git a/exts/jphp-zend-ext/src/main/tests/org/develnext/jphp/zend/ext/json/JsonFunctionsTest.java b/exts/jphp-zend-ext/src/main/tests/org/develnext/jphp/zend/ext/json/JsonFunctionsTest.java
@@ -69,9 +69,9 @@ public void testObjectJsonEncode() {
         assertEquals("{\"0\":100,\"1\":500,\"x\":100500}", JsonFunctions.json_encode(array));
 
         StdClass stdClass = new StdClass(env);
-        stdClass.getProperties().put("x", new LongMemory(100));
-        stdClass.getProperties().put("y", new LongMemory(500));
-        stdClass.getProperties().put("\0*\0z", new LongMemory(100500));
+        stdClass.getProperties().refOfIndex("x").assign(new LongMemory(100));
+        stdClass.getProperties().refOfIndex("y").assign(new LongMemory(500));
+        stdClass.getProperties().refOfIndex("\0*\0z").assign(new LongMemory(100500));
 
         assertEquals("{\"x\":100,\"y\":500}", JsonFunctions.json_encode(new ObjectMemory(stdClass)));
     }
diff --git a/exts/jphp-zend-ext/src/main/tests/resources/ext/date/DatePeriod_set_state.phpt b/exts/jphp-zend-ext/src/main/tests/resources/ext/date/DatePeriod_set_state.phpt
@@ -20,6 +20,10 @@ var_dump($datePeriodObjectNew);
 ?>
 --EXPECTF--
 object(DatePeriod)#%d (6) {
+  ["recurrences"]=>
+  int(25)
+  ["include_start_date"]=>
+  bool(true)
   ["start"]=>
   object(DateTime)#%d (3) {
     ["date"]=>
@@ -54,8 +58,4 @@ object(DatePeriod)#%d (6) {
     ["days"]=>
     int(0)
   }
-  ["recurrences"]=>
-  int(25)
-  ["include_start_date"]=>
-  bool(true)
-}
+}
diff --git a/exts/jphp-zend-ext/src/main/tests/resources/ext/date/DateTimeZone_set_state.phpt b/exts/jphp-zend-ext/src/main/tests/resources/ext/date/DateTimeZone_set_state.phpt
@@ -20,4 +20,4 @@ object(DateTimeZone)#%d (2) {
   int(3)
   ["timezone"]=>
   string(3) "UTC"
-}
+}
diff --git a/exts/jphp-zend-ext/src/main/tests/resources/ext/date/bug52738.phpt b/exts/jphp-zend-ext/src/main/tests/resources/ext/date/bug52738.phpt
@@ -13,21 +13,30 @@ echo $I->unit."\n";
 $I->unit = 42;
 echo $I->unit."\n";
 $I->d++;
-print_r($I);
---EXPECT--
+var_dump($I);
+--EXPECTF--
 1
 2
 42
-di Object
-(
-    [y] => 0
-    [m] => 0
-    [d] => 11
-    [h] => 0
-    [i] => 0
-    [s] => 0
-    [f] => 0
-    [invert] => 0
-    [days] => 
-    [unit] => 42
-)
+object(di)#%d (10) {
+  ["unit"]=>
+  int(42)
+  ["y"]=>
+  int(0)
+  ["m"]=>
+  int(0)
+  ["d"]=>
+  int(11)
+  ["h"]=>
+  int(0)
+  ["i"]=>
+  int(0)
+  ["s"]=>
+  int(0)
+  ["f"]=>
+  float(0)
+  ["invert"]=>
+  int(0)
+  ["days"]=>
+  bool(false)
+}
diff --git a/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/ExpressionStmtCompiler.java b/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/ExpressionStmtCompiler.java
@@ -1142,7 +1142,7 @@ Memory writePushParentDynamicMethod(CallExprToken function, boolean returnValue,
             return null;
 
         StaticAccessExprToken dynamic = (StaticAccessExprToken) function.getName();
-        writeLineNumber(function);
+        //writeLineNumber(function);
 
         writePushThis();
         if (dynamic.getField() != null) {
diff --git a/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/expr/value/StaticAccessValueCompiler.java b/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/expr/value/StaticAccessValueCompiler.java
@@ -41,6 +41,7 @@ public void write(StaticAccessExprToken token, boolean returnValue) {
 
             if (clazz instanceof ParentExprToken){
                 expr.writePushParent(clazz);
+                expr.writePushDupLowerCase();
             } else if (clazz instanceof NameToken){
                 expr.writePushConstString(((NameToken) clazz).getName());
                 expr.writePushConstString(((NameToken) clazz).getName().toLowerCase());
diff --git a/jphp-core/tests/php/runtime/memory/serialization/SerializerTest.java b/jphp-core/tests/php/runtime/memory/serialization/SerializerTest.java
@@ -68,7 +68,7 @@ public void testArrays(){
     }
 
     @Test
-    public void testObjects(){
+    public void testObjects() {
         Assert.assertEquals("O:8:\"stdClass\":0:{}", serialize(new ObjectMemory(new StdClass(environment))));
 
         StdClass stdClass = new StdClass(environment);
diff --git a/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionClass.java b/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionClass.java
@@ -37,7 +37,7 @@ public ReflectionClass(Environment env, ClassEntity clazz) {
 
     public ReflectionClass setEntity(ClassEntity entity) {
         this.entity = entity;
-        getProperties().put("name", new StringMemory(entity.getName()));
+        getProperties().refOfIndex("name").assign(entity.getName());
 
         return this;
     }
diff --git a/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionExtension.java b/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionExtension.java
@@ -30,7 +30,7 @@ public ReflectionExtension(Environment env) {
 
     public void setExtension(Extension extension) {
         this.extension = extension;
-        getProperties().put("name", new StringMemory(extension.getName()));
+        getProperties().refOfIndex("name").assign(extension.getName());
     }
 
     @Signature(@Arg("name"))
diff --git a/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionFunction.java b/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionFunction.java
@@ -43,7 +43,7 @@ public ReflectionFunction(Environment env, ClassEntity clazz) {
 
     public void setFunctionEntity(FunctionEntity functionEntity) {
         this.functionEntity = functionEntity;
-        getProperties().put("name", new StringMemory(functionEntity.getName()));
+        getProperties().refOfIndex("name").assign(functionEntity.getName());
     }
 
     @Signature(@Arg(value = "name"))
diff --git a/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionMethod.java b/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionMethod.java
@@ -49,8 +49,8 @@ public ReflectionMethod(Environment env, ClassEntity clazz) {
 
     public void setEntity(MethodEntity entity) {
         this.methodEntity = entity;
-        getProperties().put("name", new StringMemory(entity.getName()));
-        getProperties().put("class", new StringMemory(entity.getClazz().getName()));
+        getProperties().refOfIndex("name").assign(new StringMemory(entity.getName()));
+        getProperties().refOfIndex("class").assign(new StringMemory(entity.getClazz().getName()));
     }
 
     @Signature({@Arg("class"), @Arg("name")})
diff --git a/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionParameter.java b/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionParameter.java
@@ -100,7 +100,7 @@ public Memory __construct(Environment env, Memory... args) {
 
     public void setEntity(ParameterEntity entity) {
         this.entity = entity;
-        getProperties().put("name", new StringMemory(entity.getName()));
+        getProperties().refOfIndex("name").assign(entity.getName());
     }
 
     public void setFunctionEntity(AbstractFunctionEntity functionEntity) {
diff --git a/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionProperty.java b/jphp-runtime/src/php/runtime/ext/core/reflection/ReflectionProperty.java
@@ -34,8 +34,8 @@ public ReflectionProperty(Environment env, ClassEntity clazz) {
 
     public void setEntity(PropertyEntity entity) {
         this.entity = entity;
-        getProperties().put("name", new StringMemory(entity.getName()));
-        getProperties().put("class", new StringMemory(entity.getClazz().getName()));
+        getProperties().refOfIndex("name").assign(new StringMemory(entity.getName()));
+        getProperties().refOfIndex("class").assign(new StringMemory(entity.getClazz().getName()));
     }
 
     @Signature({@Arg("class"), @Arg("name")})
diff --git a/jphp-runtime/src/php/runtime/lang/BaseObject.java b/jphp-runtime/src/php/runtime/lang/BaseObject.java
@@ -11,7 +11,7 @@
 @Ignore
 @BaseType
 abstract public class BaseObject implements IObject {
-    protected ArrayMemory __dynamicProperties__;
+    volatile protected ArrayMemory __dynamicProperties__;
     protected ClassEntity __class__;
     protected final Environment __env__;
 
@@ -20,6 +20,9 @@ abstract public class BaseObject implements IObject {
     public BaseObject(Environment env){
         this(env, null);
         __class__ = env.fetchClass(getClass());
+        if (__class__ != null) {
+            __dynamicProperties__ = __class__.getInitProperties(env);
+        }
     }
 
     protected BaseObject(ClassEntity entity) {
@@ -30,7 +33,7 @@ protected BaseObject(ClassEntity entity) {
 
     public BaseObject(Environment env, ClassEntity clazz) {
         this.__class__ = clazz;
-        this.__dynamicProperties__ = new ArrayMemory(true);
+        this.__dynamicProperties__ = clazz == null ? ArrayMemory.emptyMap() : clazz.getInitProperties(env);
         this.__env__ = env;
     }
 
@@ -50,9 +53,7 @@ public ArrayMemory getProperties() {
             synchronized (this) {
                 if (__dynamicProperties__ != null) return __dynamicProperties__;
 
-                if (__dynamicProperties__ == null) {
-                    __dynamicProperties__ = new ArrayMemory(true);
-                }
+                __dynamicProperties__ = __class__.getInitProperties(__env__);
             }
         }
 
diff --git a/jphp-runtime/src/php/runtime/lang/BaseWrapper.java b/jphp-runtime/src/php/runtime/lang/BaseWrapper.java
@@ -13,7 +13,7 @@
 @Ignore
 @BaseType
 abstract public class BaseWrapper<T> implements IObject, IComparableObject<BaseWrapper> {
-    protected final ArrayMemory __dynamicProperties__;
+    protected ArrayMemory __dynamicProperties__;
     protected ClassEntity __class__;
     protected final Environment __env__;
 
@@ -24,12 +24,15 @@ abstract public class BaseWrapper<T> implements IObject, IComparableObject<BaseW
     public BaseWrapper(Environment env, T wrappedObject){
         this(env, (ClassEntity) null);
         __class__ = env.fetchClass(getClass());
+        if (__class__ != null) {
+            __dynamicProperties__ = __class__.getInitProperties(env);
+        }
         __wrappedObject = wrappedObject;
     }
 
     public BaseWrapper(Environment env, ClassEntity clazz) {
         this.__class__ = clazz;
-        this.__dynamicProperties__ = new ArrayMemory(true);
+        this.__dynamicProperties__ = clazz == null ? ArrayMemory.emptyMap() : clazz.getInitProperties(env);
         this.__env__ = env;
     }
 
diff --git a/jphp-runtime/src/php/runtime/lang/IObject.java b/jphp-runtime/src/php/runtime/lang/IObject.java
@@ -22,6 +22,12 @@ public interface IObject {
     boolean isFinalized();
     void doFinalize();
 
+    default ArrayMemory getPropertiesForChange() {
+        ArrayMemory properties = getProperties();
+        properties.checkCopied();
+        return properties;
+    }
+
     default boolean hasProp(String name) {
         return getProperties().containsKey(name);
     }
@@ -31,27 +37,39 @@ default Memory getProp(String name) {
     }
 
     default void setProp(String name, Memory value) {
-        getProperties().putAsKeyString(name, value.fast_toImmutable());
+        ArrayMemory properties = getProperties();
+        properties.checkCopied();
+        properties.putAsKeyString(name, value.fast_toImmutable());
     }
 
     default void setProp(String name, String value) {
-        getProperties().putAsKeyString(name, StringMemory.valueOf(value));
+        ArrayMemory properties = getProperties();
+        properties.checkCopied();
+        properties.putAsKeyString(name, StringMemory.valueOf(value));
     }
 
     default void setProp(String name, long value) {
-        getProperties().putAsKeyString(name, LongMemory.valueOf(value));
+        ArrayMemory properties = getProperties();
+        properties.checkCopied();
+        properties.putAsKeyString(name, LongMemory.valueOf(value));
     }
 
     default void setProp(String name, double value) {
-        getProperties().putAsKeyString(name, DoubleMemory.valueOf(value));
+        ArrayMemory properties = getProperties();
+        properties.checkCopied();
+        properties.putAsKeyString(name, DoubleMemory.valueOf(value));
     }
 
     default void setProp(String name, boolean value) {
-        getProperties().putAsKeyString(name, TrueMemory.valueOf(value));
+        ArrayMemory properties = getProperties();
+        properties.checkCopied();
+        properties.putAsKeyString(name, TrueMemory.valueOf(value));
     }
 
     default void removeProp(String name) {
-        getProperties().removeByScalar(name);
+        ArrayMemory properties = getProperties();
+        properties.checkCopied();
+        properties.removeByScalar(name);
     }
 
     default Memory callMethod(Environment env, String name, Memory... args) {
diff --git a/jphp-runtime/src/php/runtime/lang/exception/BaseBaseException.java b/jphp-runtime/src/php/runtime/lang/exception/BaseBaseException.java
@@ -21,7 +21,7 @@
 import java.lang.ref.WeakReference;
 
 abstract public class BaseBaseException extends RuntimeException implements IObject, JPHPException {
-    protected final ArrayMemory props;
+    protected ArrayMemory props;
     protected ClassEntity clazz;
     protected Environment env;
     protected TraceInfo trace;
@@ -40,11 +40,14 @@ public BaseBaseException(String message) {
     public BaseBaseException(Environment env){
         this(env, null);
         clazz = env == null ? null : env.fetchClass(getClass());
+        if (clazz != null) {
+            props = clazz.getInitProperties(env);
+        }
     }
 
     public BaseBaseException(Environment env, ClassEntity clazz) {
         this.clazz = clazz;
-        this.props = new ArrayMemory(true);
+        this.props = clazz == null ? ArrayMemory.emptyMap() : clazz.getInitProperties(env);
         this.env = env;
     }
 
diff --git a/jphp-runtime/src/php/runtime/lang/exception/BaseError.java b/jphp-runtime/src/php/runtime/lang/exception/BaseError.java
@@ -28,7 +28,7 @@
                 @Reflection.Arg(value = "position", modifier = Modifier.PROTECTED, type = HintType.INT)
         }
 )
-public class BaseError  extends BaseBaseException implements BaseThrowable {
+public class BaseError extends BaseBaseException implements BaseThrowable {
     protected ErrorType errorType = ErrorType.E_CORE_ERROR;
 
     public BaseError(Environment env) {
diff --git a/jphp-runtime/src/php/runtime/memory/ArrayMemory.java b/jphp-runtime/src/php/runtime/memory/ArrayMemory.java
diff --git a/jphp-runtime/src/php/runtime/memory/ObjectMemory.java b/jphp-runtime/src/php/runtime/memory/ObjectMemory.java
diff --git a/jphp-runtime/src/php/runtime/memory/output/serialization/Deserializer.java b/jphp-runtime/src/php/runtime/memory/output/serialization/Deserializer.java
diff --git a/jphp-runtime/src/php/runtime/memory/output/serialization/Serializer.java b/jphp-runtime/src/php/runtime/memory/output/serialization/Serializer.java
diff --git a/jphp-runtime/src/php/runtime/reflection/ClassEntity.java b/jphp-runtime/src/php/runtime/reflection/ClassEntity.java

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ public static Memory __set_state(Environment env, TraceInfo traceInfo, Memory ar`
`63`	`63`	`datePeriod.end = array.refOfIndex(traceInfo, "end");`
`64`	`64`	`datePeriod.current = array.refOfIndex(traceInfo, "current");`
`65`	`65`
`66`		`-`
`67`	`66`	`return new ObjectMemory(datePeriod);`
`68`	`67`	`}`
`69`	`68`