wip

Author: GregoryTravis

distribution/lib/Standard/Base/0.0.0-dev/src/Network/Reload_Detector.enso

@@ -1,32 +1,36 @@
-import Standard.Base.Data.Boolean.Boolean
+import Standard.Base.Error.Error
 import Standard.Base.Nothing.Nothing
 import Standard.Base.Runtime.Managed_Resource.Managed_Resource
 import Standard.Base.Runtime.Ref.Ref
+from Standard.Base.Data.Boolean import Boolean, True, False
+
+## PRIVATE
+type Reload_Detector_Fake
+    Value
 
 ## PRIVATE
    This is used by ReloadDetector.java to create a `Managed_Resource` that is
-   finalized when the reload button is pressed.
+   garbage collected when the reload button is pressed.
 
-   The `on_finalize` function and the `clear` method both write `Nothing` to the
-   ref. This is a signal that a reload has happenend. `on_finalize` is called by
-   the engine when a reload happens. `clear` is only for testing, to simulate a
-   reload.
+   The managed resource contains a Ref containing a 0 (the value is
+   unimportant). When the reload button is pressed, the ref is removed and
+   attempting to access it using `with` throws an `Uninitialized_State`. When
+   the `Uninitialized_State` is detected, it indicates that the reload has been
+   initiated.
 
-   The `0` value stored in the ref is not used; it just has to be something
-   other than Nothing.
+   For standard library testing, a special fake value is stored in the ref to
+   indicate a reload.
 type Reload_Detector
     private Value mr:Managed_Resource
 
     new -> Reload_Detector =
-        ref = Ref.new 0
-        on_finalize ref = ref.put Nothing
-        mr = Managed_Resource.register ref on_finalize Boolean.True
+        mr = Managed_Resource.register (Ref.new 0) (x-> Nothing) True
         Reload_Detector.Value mr
 
-    get self = self.mr.with .get
+    has_reload_occurred self =
+        self.mr.has_been_collected || self.mr.with (ref-> ref.get.is_a Reload_Detector_Fake)
 
-    clear self =
-        self.mr.with (ref-> ref.put Nothing)
-        Nothing
+    simulate_reload_test_only self =
+        self.mr.with ref-> ref.put Reload_Detector_Fake.Value
 
 create_reload_detector = Reload_Detector.new

distribution/lib/Standard/Base/0.0.0-dev/src/Runtime/Managed_Resource.enso

@@ -1,8 +1,9 @@
 ## An API for manual resource management.
 
 import project.Any.Any
+import project.Errors.Common.Uninitialized_State
 import project.Nothing.Nothing
-from project.Data.Boolean import Boolean, False
+from project.Data.Boolean import Boolean, True, False
 
 ## Resource provides an API for manual management of computation resources.
 
@@ -90,5 +91,15 @@ type Managed_Resource
     take : Any
     take self = @Builtin_Method "Managed_Resource.take"
 
+    ## PRIVATE
+       ADVANCED
+
+       Returns true iff the resource has been collected by the engine, false
+       otherwise. If `with` throws any other error, it is propagated.
+    has_been_collected : Boolean
+    has_been_collected self -> Boolean = self.with x->
+        if x.is_error.not then False else
+            if x.catch.is_a Uninitialized_State then True else x
+
 register_builtin r fn sys:Boolean = @Builtin_Method "Managed_Resource.register_builtin"
 with_builtin r fn = @Builtin_Method "Managed_Resource.with_builtin"

std-bits/base/src/main/java/org/enso/base/cache/ReloadDetector.java

@@ -20,7 +20,7 @@ public ReloadDetector() {
   }
 
   public boolean hasReloadOccurred() {
-    var reloadHasOccurred = trigger.invokeMember("get").isNull();
+    var reloadHasOccurred = trigger.invokeMember("has_reload_occurred").asBoolean();
     if (reloadHasOccurred) {
       resetTrigger();
     }
@@ -34,6 +34,6 @@ private void resetTrigger() {
   }
 
   void simulateReloadTestOnly() {
-    trigger.invokeMember("clear");
+    trigger.invokeMember("simulate_reload_test_only");
   }
 }

test/Table_Tests/src/IO/Fetch_Spec.enso

@@ -521,24 +521,24 @@ add_specs suite_builder =
                 LRUCache.new . getSettings . getTotalCacheLimit . should_equal (TotalCacheLimit.Percentage.new 0.2)
 
         group_builder.specify "Cache should be cleared when a reload is detected" <|
-            HTTP.fetch base_url_with_slash+'test_download?max-age=16&length=10'
-            HTTP.fetch base_url_with_slash+'test_download?max-age=16&length=11'
-            HTTP.fetch base_url_with_slash+'test_download?max-age=16&length=12'
+            HTTP.fetch base_url_with_slash+'test_download?length=10'
+            HTTP.fetch base_url_with_slash+'test_download?length=11'
+            HTTP.fetch base_url_with_slash+'test_download?length=12'
             get_num_response_cache_entries . should_equal 3
 
             fake_reload
 
             get_num_response_cache_entries . should_equal 3  # Cleaning is not triggered until the next request
-            HTTP.fetch base_url_with_slash+'test_download?max-age=16&length=13'
+            HTTP.fetch base_url_with_slash+'test_download?length=13'
             get_num_response_cache_entries . should_equal 1
-            HTTP.fetch base_url_with_slash+'test_download?max-age=16&length=14'
-            HTTP.fetch base_url_with_slash+'test_download?max-age=16&length=15'
+            HTTP.fetch base_url_with_slash+'test_download?length=14'
+            HTTP.fetch base_url_with_slash+'test_download?length=15'
             get_num_response_cache_entries . should_equal 3
 
             fake_reload
 
             get_num_response_cache_entries . should_equal 3  # Cleaning is not triggered until the next request
-            HTTP.fetch base_url_with_slash+'test_download?max-age=16&length=16'
+            HTTP.fetch base_url_with_slash+'test_download?length=16'
             get_num_response_cache_entries . should_equal 1
 
         group_builder.specify "Reissues the request if the cache file disappears" pending=pending_has_url <| Test.with_retries <|