From 0d2ac42686f14dadc16b5516b97e5e8fafdb9fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Mon, 6 Mar 2023 15:12:51 +0100
Subject: [PATCH] [server] Fixes updates of the property synchronized array.
The change of a property status can also impact the status of other properties
which are logical consequences of the first one (and so on: these logical
consequences can be hypotheses of yet other properties).
In the server, when a property is modified, as we can't known which other
properties are impacted, the whole synchronized array is reloaded.
---
src/plugins/server/kernel_properties.ml | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/plugins/server/kernel_properties.ml b/src/plugins/server/kernel_properties.ml
index a130f3d5634..46bf49f941a 100644
--- a/src/plugins/server/kernel_properties.ml
+++ b/src/plugins/server/kernel_properties.ml
@@ -323,16 +323,6 @@ let is_relevant ip =
let iter f = Property_status.iter (fun ip -> if is_relevant ip then f ip)
-let add_update_hook f =
- Property_status.register_property_add_hook
- (fun ip -> if is_relevant ip then f ip);
- Property_status.register_status_update_hook
- (fun _emitter ip _status -> if is_relevant ip then f ip)
-
-let add_remove_hook f =
- Property_status.register_property_remove_hook
- (fun ip -> if is_relevant ip then f ip)
-
let array =
States.register_array
~package
@@ -341,10 +331,21 @@ let array =
~key:(fun ip -> Kernel_ast.Marker.create (PIP ip))
~keyType:Kernel_ast.Marker.jproperty
~iter
- ~add_update_hook
- ~add_remove_hook
model
let reload () = States.reload array
+(* Reloads the whole array when a property is added, removed or when its status
+ changes. As a property can be a logical consequence of other properties, a
+ property change can impact the logical status of any other property: a full
+ reload is needed. *)
+let () =
+ Property_status.register_property_add_hook
+ (fun _ip -> reload ());
+ Property_status.register_status_update_hook
+ (fun _emitter _ip _status -> reload ());
+ Property_status.register_property_remove_hook
+ (fun _ip -> reload ())
+
+
(* -------------------------------------------------------------------------- *)
--
GitLab