Add SoftReference

.travis.yml

@@ -22,8 +22,6 @@ env:
 before_install:
   - phpize && ./configure && make
 
-install:
-
 script:
   - sh -c "make test | tee result.txt"
   - sh test-report.sh
@@ -32,7 +30,3 @@ addons:
   apt:
     packages:
       - valgrind
-
-#notifications:
-#  email:
-#    - [email protected]

README.md

@@ -4,8 +4,9 @@
 [![Windows Build status](https://ci.appveyor.com/api/projects/status/7r07eydi6c3lj36a/branch/master?svg=true)](https://ci.appveyor.com/project/pinepain/php-weak)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/pinepain/php-weak/master/LICENSE)
 
-This extension provides [weak references](https://en.wikipedia.org/wiki/Weak_reference) support for PHP 7 and serves
-as a ground for other weak data structures.
+This extension adds [Soft Reference](https://en.wikipedia.org/wiki/Weak_reference) and
+[Weak References](https://en.wikipedia.org/wiki/Weak_reference) to PHP 7 and may serve as a ground for other
+data structures that require advanced referencing model.
 
 
 ## Usage
@@ -14,12 +15,18 @@ as a ground for other weak data structures.
 <?php
 
 use Weak\Reference;
+use Weak\SoftReference;
 
-$obj = new stdClass();
+$obj = new class {
+    public function __destruct() {
+        echo 'Destructor called', PHP_EOL;
+    }
+};
 
-$ref = new Reference($obj, function () { echo 'Object destroyed', PHP_EOL; });
+$softref = new SoftReference($obj, function () { echo 'Object will be destroyed', PHP_EOL; });
+$weakref = new Reference($obj, function () { echo 'Object destroyed', PHP_EOL; });
 
-$obj = null; // outputs "Object destroyed"
+$obj = null; // outputs "Object will be destroyed", "Destructor called", "Object destroyed" in this specific order.
 ```
 
 
@@ -29,20 +36,33 @@ This extension adds `Weak` namespace and all entities are created inside it.
 
 There are no INI setting or constants provided by this extension.
 
-Brief docs about [`Weak\Reference` class](./stubs/weak/Reference.php) and [functions](./stubs/weak/functions.php)
+Brief docs about classes and [functions](./stubs/weak/functions.php)
 may be seen in [stub files](./stubs/weak).
 
 Short list if what provided by this extension is:
 
-  - `class Weak\Reference`
-  - `class Weak\NotifierException extend Exception`
+  - `abstract class Weak\AbstractReference` *may not be subclassed directly* [doc](./stubs/weak/AbstractReference.php)
+  - `class Weak\SoftReference extends AbstractReference` [doc](./stubs/weak/SoftReference.php)
+  - `class Weak\Reference extends AbstractReference` [doc](./stubs/weak/Reference.php)
+  - `class Weak\NotifierException extend Exception` [doc](./stubs/weak/NotifierException.php)
   - `function Weak\refcounted()`
   - `function Weak\refcount()`
+  - `function Weak\softrefcounted()`
+  - `function Weak\softrefcount()`
+  - `function Weak\softrefs()`
   - `function Weak\weakrefcounted()`
   - `function Weak\weakrefcount()`
   - `function Weak\weakrefs()`
   - `function Weak\object_handle()`
+  - `function Weak\is_obj_destructor_called()`
+
+### References
+
+There are two type of reference provided by this extension: `SoftReference` and `Reference`. The main difference is that
+`SoftReference` call it notifier before referent object will be destructed which allows to prevent object be destroyed,
+while `Reference` call it notifier after referent object was destructed.
 
+Note: What this extension provides aren't quite actual soft and weak references, but it comes close for most use cases.
 
 ### Notifiers
 
@@ -53,14 +73,14 @@ will return `null` (unless rare case when object refcount get incremented in des
 somewhere else).
 
 If object destructor or one or more notifiers throw exception, all further notifier callbacks will be called as if
-that exception was thrown inside `try-catch` block. In case one or more exception was thrown, `Weak\NotifierException`
+that exception was thrown inside `try-catch` block. In case one or more exceptions were thrown, `Weak\NotifierException`
 will be thrown and all thrown exceptions will be available via `Weak\NotifierException::getExceptions()` method.
 
 
 ### Cloning
 
-When `Weak\Reference` cloned, notifier cloned too, so when tracking object destroyed, both notifier will be called, but
-they will be invoked with different `Weak\Reference` objects.
+When reference is cloned, notifier is cloned too, so when tracked object destroyed, both notifier will be called,
+but they will be invoked with different reference objects.
 
 ```php
 <?php
@@ -101,14 +121,14 @@ $obj = null; // outputs "Own notifier called" and then "Object destroyed"
 
 ### Serializing
 
-Serializing `Weak\Reference` is prohibited. Attempting to implement the `Serializable` interface will lead to a
+Serializing reference object is prohibited. Attempting to implement the `Serializable` interface will lead to a
 fatal error.
 
 
 ## Stub files
 
-If you are also using Composer, it is recommended that you add the [php-weak-stub](https://github.com/pinepain/php-weak-stubs)
-package as a dev-mode requirement. This provides skeleton definitions and annotations to enable support for auto-completion
+If you are also using Composer, it is recommended to add the [php-weak-stub](https://github.com/pinepain/php-weak-stubs)
+package as a dev-mode requirement. It provides skeleton definitions and annotations to enable support for auto-completion
 in your IDE and other code-analysis tools.
 
     composer require --dev pinepain/php-weak-stubs
@@ -137,7 +157,7 @@ To install extension globally run
 
     # sudo make install
 
-You will need to copy the extension config to your php dir, here is example for Ubuntu with PHP 7 from
+You will need to copy the extension config to your php dir, here is example for Ubuntu with PHP 7.0 from
 [Ondřej Surý's PPA for PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php):
 
     # sudo cp provision/php/weak.ini /etc/php/mods-available/
@@ -156,23 +176,17 @@ You may also want to add php-weak extension as a [composer.json dependency](http
 ## Internals
 
 `Weak\Reference` class is implemented by storing tracked object handlers and then wrapping it original `dtor_obj` handler 
-with custom one, which meta-code is:
+with a custom one, which meta-code is:
 
 ```php
 $exceptions = [];
 
-try {
-    run_original_dtor_obj($object);
-} catch(Throwable $e) {
-    $exceptions[] = $e;
-}
-
-foreach($weak_references as $weak_ref_object_handle => $weak_reference) {
+foreach($soft_references as $soft_ref_object_handle => $soft_reference) {
     if (is_array($weak_reference->notifier)) {
-        $weak_reference->notifier[] = $weak_reference;
-    } elseif (is_callable($weak_reference->notifier)) {
+        $soft_reference->notifier[] = $weak_reference;
+    } elseif (is_callable($soft_reference->notifier)) {
         try {
-            $weak_reference->notifier($weak_reference);
+            $soft_reference->notifier($weak_reference);
         } catch(Throwable $e) {
             $exceptions[] = $e;
         }
@@ -182,11 +196,38 @@ foreach($weak_references as $weak_ref_object_handle => $weak_reference) {
 if ($exceptions) {
     throw new Weak\NotifierException('One or more exceptions thrown during notifiers calling', $exceptions);
 }
+
+if (refcount($object) == 1) {
+    try {
+        run_original_dtor_obj($object);
+    } catch(Throwable $e) {
+        $exceptions[] = $e;
+    }
+
+    foreach($weak_references as $weak_ref_object_handle => $weak_reference) {
+        if (is_array($weak_reference->notifier)) {
+            $weak_reference->notifier[] = $weak_reference;
+        } elseif (is_callable($weak_reference->notifier)) {
+            try {
+                $weak_reference->notifier($weak_reference);
+            } catch(Throwable $e) {
+                $exceptions[] = $e;
+            }
+        }
+    }
+
+    if ($exceptions) {
+        throw new Weak\NotifierException('One or more exceptions thrown during notifiers calling', $exceptions);
+    }
+} else {
+    // required while internally PHP GC mark object as it dtor was called before calling dtor
+    mark_object_as_no_destructor_was_called($object);
+}
 ```
 
 ## Development and testing
 
-This extension shipped with Vagrant file which provides basic environment for development and testing purposes. 
+This extension shipped with Vagrant file which provides basic environment for development and testing purposes.
 To start it, just type `vagrant up` and then `vagrant ssh` in php-weak directory.
 
 Services available out of the box are:
@@ -204,12 +245,14 @@ between large variety of PHP versions.
 
 ## Reference:
 
+  [Soft reference on Wikipedia](https://en.wikipedia.org/wiki/Soft_reference)
   [Weak reference on Wikipedia](https://en.wikipedia.org/wiki/Weak_reference)
 
 #### In other languages:
 
 ##### Java:
 
+  - [Class `SoftReference<T>`](https://docs.oracle.com/javase/7/docs/api/java/lang/ref/SoftReference.html)
   - [Class `WeakReference<T>`](https://docs.oracle.com/javase/7/docs/api/java/lang/ref/WeakReference.html)
   - [Guidelines for using the Java 2 reference classes](http://www.ibm.com/developerworks/library/j-refs/)
   - [Strong, Soft, Weak and Phantom References](http://neverfear.org/blog/view/150/Strong_Soft_Weak_and_Phantom_References_Java)

php_weak_functions.c

@@ -42,6 +42,77 @@ PHP_FUNCTION(refcount)
     RETURN_LONG(0);
 } /* }}} */
 
+PHP_FUNCTION(softrefcounted) /* {{{ */
+{
+    zval *zv;
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zv) == FAILURE) {
+        return;
+    }
+
+    if (IS_OBJECT == Z_TYPE_P(zv)) {
+        php_weak_referent_t *referent = php_weak_referent_find_ptr((zend_ulong)Z_OBJ_HANDLE_P(zv));
+
+        RETURN_BOOL(NULL != referent && zend_hash_num_elements(&referent->soft_references));
+    }
+
+    RETURN_BOOL(0);
+} /* }}} */
+
+PHP_FUNCTION(softrefcount) /* {{{ */
+{
+    zval *zv;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zv) == FAILURE) {
+        return;
+    }
+
+    if (IS_OBJECT == Z_TYPE_P(zv)) {
+
+        php_weak_referent_t *referent = php_weak_referent_find_ptr((zend_ulong)Z_OBJ_HANDLE_P(zv));
+
+        if (NULL == referent) {
+            RETURN_LONG(0);
+        }
+
+        RETURN_LONG(zend_hash_num_elements(&referent->soft_references));
+    }
+
+    RETURN_LONG(0);
+} /* }}} */
+
+PHP_FUNCTION(softrefs) /* {{{ */
+{
+    zval *zv;
+    zval  softrefs;
+
+    php_weak_reference_t *reference;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zv) == FAILURE) {
+        return;
+    }
+
+    ZVAL_UNDEF(&softrefs);
+
+    if (IS_OBJECT == Z_TYPE_P(zv)) {
+        php_weak_referent_t *referent = php_weak_referent_find_ptr((zend_ulong)Z_OBJ_HANDLE_P(zv));
+
+        if (NULL != referent) {
+            array_init_size(&softrefs, zend_hash_num_elements(&referent->soft_references));
+
+            ZEND_HASH_FOREACH_PTR(&referent->soft_references, reference) {
+                        add_next_index_zval(&softrefs, &reference->this_ptr);
+                        Z_ADDREF(reference->this_ptr);
+                    } ZEND_HASH_FOREACH_END();
+        }
+    }
+
+    if (IS_UNDEF == Z_TYPE(softrefs)) {
+        array_init_size(&softrefs, 0);
+    }
+
+    RETURN_ZVAL(&softrefs, 1, 1);
+} /* }}} */
+
 PHP_FUNCTION(weakrefcounted) /* {{{ */
 {
     zval *zv;
@@ -118,12 +189,27 @@ PHP_FUNCTION(object_handle) /* {{{ */
     zval *zv;
 
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &zv) == FAILURE) {
-        RETURN_NULL();
+        return;
     }
 
     RETURN_LONG((uint32_t)Z_OBJ_HANDLE_P(zv));
 }  /* }}} */
 
+PHP_FUNCTION(is_obj_destructor_called) /* {{{ */
+{
+    zval *zv;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &zv) == FAILURE) {
+        return;
+    }
+
+    zend_object *obj = Z_OBJ_P(zv);
+
+    uint32_t flags = GC_FLAGS(obj);
+
+    RETURN_BOOL(flags & IS_OBJ_DESTRUCTOR_CALLED);
+}  /* }}} */
+
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(refcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, NULL, 0)
                 ZEND_ARG_INFO(0, value)
@@ -133,6 +219,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(refcount_arg, ZEND_RETURN_VALUE, 1, IS_L
                 ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, NULL, 0)
+                ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefcount_arg, ZEND_RETURN_VALUE, 1, IS_LONG, NULL, 0)
+                ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefs_arg, ZEND_RETURN_VALUE, 1, IS_ARRAY, NULL, 0)
+                ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(weakrefcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, NULL, 0)
                 ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
@@ -149,16 +247,24 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(object_handle_arg, ZEND_RETURN_VALUE, 1,
                 ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(is_obj_destructor_called_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, NULL, 0)
+                ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
 
 const zend_function_entry php_weak_functions[] = { /* {{{ */
     ZEND_NS_FE(PHP_WEAK_NS, refcounted, refcounted_arg)
     ZEND_NS_FE(PHP_WEAK_NS, refcount, refcount_arg)
 
+    ZEND_NS_FE(PHP_WEAK_NS, softrefcounted, softrefcounted_arg)
+    ZEND_NS_FE(PHP_WEAK_NS, softrefcount, softrefcount_arg)
+    ZEND_NS_FE(PHP_WEAK_NS, softrefs, softrefs_arg)
+
     ZEND_NS_FE(PHP_WEAK_NS, weakrefcounted, weakrefcounted_arg)
     ZEND_NS_FE(PHP_WEAK_NS, weakrefcount, weakrefcount_arg)
     ZEND_NS_FE(PHP_WEAK_NS, weakrefs, weakrefs_arg)
 
     ZEND_NS_FE(PHP_WEAK_NS, object_handle, object_handle_arg)
+    ZEND_NS_FE(PHP_WEAK_NS, is_obj_destructor_called, is_obj_destructor_called_arg)
 
     PHP_FE_END
 }; /* }}} */