feat: add mp support forshare

tassiluca · tassiluca · commit 62c00de23394 · 2025-10-23T18:49:36.000+02:00
diff --git a/scafi3-integration/src/test/scala/it/unibo/scafi/integration/PlatformTest.scala b/scafi3-integration/src/test/scala/it/unibo/scafi/integration/PlatformTest.scala
@@ -104,7 +104,7 @@ object PlatformTest:
 
   class SubstitutionBuilder:
     private var _substitutions = Set.empty[Substitution]
-    private[PlatformTest] def add(key: Pattern, value: String): Unit = _substitutions += ((key, value))
+    private[PlatformTest] def add(key: Pattern, value: String): Unit = _substitutions += (key, value)
     def substitutions: Set[Substitution] = _substitutions.view.toSet
 
   extension (pattern: Pattern)
diff --git a/scafi3-mp-api/js/src/main/scala/it/unibo/scafi/libraries/FullLibrary.scala b/scafi3-mp-api/js/src/main/scala/it/unibo/scafi/libraries/FullLibrary.scala
@@ -5,6 +5,7 @@ import scala.scalajs.js.annotation.JSExportTopLevel
 
 import it.unibo.scafi.language.AggregateFoundation
 import it.unibo.scafi.language.common.syntax.BranchingSyntax
+import it.unibo.scafi.language.fc.syntax.FieldCalculusSyntax
 import it.unibo.scafi.language.xc.FieldBasedSharedData
 import it.unibo.scafi.language.xc.syntax.ExchangeSyntax
 import it.unibo.scafi.message.JSBinaryCodable.jsBinaryCodable
@@ -18,7 +19,7 @@ import it.unibo.scafi.types.{ EqWrapper, JSTypes }
 @SuppressWarnings(Array("scalafix:DisableSyntax.asInstanceOf"))
 @JSExportTopLevel("FullLibrary")
 class FullLibrary(using
-    lang: AggregateFoundation & ExchangeSyntax & BranchingSyntax & FieldBasedSharedData,
+    lang: AggregateFoundation & ExchangeSyntax & BranchingSyntax & FieldBasedSharedData & FieldCalculusSyntax,
 ) extends FullPortableLibrary
     with JSFieldBasedSharedData
     with JSTypes:
diff --git a/scafi3-mp-api/native/src/main/resources/include/internals.h b/scafi3-mp-api/native/src/main/resources/include/internals.h
@@ -3,12 +3,13 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
+#include "message.h"
 
 typedef struct MapImpl* Map;
 
 Map map_empty();
-void map_put(Map map, const void* key, const void* value);
-void* map_get(const Map map, const void* key);
+void* map_put(Map map, const Eq* key, const void* value);
+void* map_get(const Map map, const Eq* key);
 size_t map_size(const Map map);
 void map_free(Map map);
 
diff --git a/scafi3-mp-api/native/src/main/resources/include/libraries.h b/scafi3-mp-api/native/src/main/resources/include/libraries.h
@@ -26,9 +26,9 @@ static inline ReturnSending* return_sending(const Field* r, const Field* s) {
 typedef struct AggregateLibrary {
     FieldBasedSharedData Field;
     const BinaryCodable* (*local_id)(void);
-    const Field* (*device)(void);
     const void* (*branch)(bool condition, const void* (*true_branch)(void), const void* (*false_branch)(void));
     const Field* (*exchange)(const Field* initial, ReturnSending* (*f)(const Field* in));
+    const BinaryCodable* (*share)(const BinaryCodable* initial, const BinaryCodable* (*f)(const Field* nvalues));
 } AggregateLibrary;
 
 #endif // LIBRARIES_H
diff --git a/scafi3-mp-api/native/src/main/resources/include/message.h b/scafi3-mp-api/native/src/main/resources/include/message.h
@@ -5,12 +5,16 @@
 #include <stdbool.h>
 #include <stddef.h>
 
+typedef struct Eq {
+    bool (*cmp)(const void* a, const void* b);
+    uint32_t (*hash)(const void* data);
+} Eq;
+
 typedef struct BinaryCodable {
+    Eq eq;
     char* type_name;
     const uint8_t* (*encode)(const void *data, size_t *encoded_size);
     const void* (*decode)(const uint8_t *buffer, size_t size);
-    bool (*cmp)(const void* a, const void* b);
-    uint32_t (*hash)(const void* data);
     char* (*to_str)(const void* data);
 } BinaryCodable;
 
diff --git a/scafi3-mp-api/native/src/main/resources/include/utils.h b/scafi3-mp-api/native/src/main/resources/include/utils.h
@@ -14,22 +14,28 @@
 
 #define fn lambda
 
-#define MAP_OF(Name, KeysTypePtr, ValuesTypePtr)                                                \
-    typedef Map Name;                                                                           \
-    static inline Name Name##_empty() {                                                         \
-        return map_empty();                                                                     \
-    }                                                                                           \
-    static inline void Name##_put(Name map, const KeysTypePtr key, const ValuesTypePtr value) { \
-        map_put(map, key, value);                                                               \
-    }                                                                                           \
-    static inline ValuesTypePtr Name##_get(const Name map, const KeysTypePtr key) {             \
-        return (ValuesTypePtr)map_get(map, key);                                                \
-    }                                                                                           \
-    static inline size_t Name##_size(const Name map) {                                          \
-        return map_size(map);                                                                   \
-    }                                                                                           \
-    static inline void Name##_free(Name map) {                                                  \
-        map_free(map);                                                                          \
+#define EQ_CAST(key) _Generic((key),        \
+    const Eq*: (const Eq*)(key),            \
+    Eq*: (const Eq*)(key),                  \
+    const BinaryCodable*: (const Eq*)(key), \
+    BinaryCodable*: (const Eq*)(key))
+
+#define MAP_OF(Name, KeysTypePtr, ValuesTypePtr)                                                         \
+    typedef Map Name;                                                                                    \
+    static inline Name Name##_empty() {                                                                  \
+        return map_empty();                                                                              \
+    }                                                                                                    \
+    static inline ValuesTypePtr Name##_put(Name map, const KeysTypePtr key, const ValuesTypePtr value) { \
+        return (ValuesTypePtr)map_put(map, EQ_CAST(key), value);                                         \
+    }                                                                                                    \
+    static inline ValuesTypePtr Name##_get(const Name map, const KeysTypePtr key) {                      \
+        return (ValuesTypePtr)map_get(map, EQ_CAST(key));                                                \
+    }                                                                                                    \
+    static inline size_t Name##_size(const Name map) {                                                   \
+        return map_size(map);                                                                            \
+    }                                                                                                    \
+    static inline void Name##_free(Name map) {                                                           \
+        map_free(map);                                                                                   \
     }
 
 #endif // UTILS_H
diff --git a/scafi3-mp-api/native/src/main/resources/utils/int_codable.c b/scafi3-mp-api/native/src/main/resources/utils/int_codable.c
@@ -59,8 +59,8 @@ static void init_int_value(Int* iv, int value) {
     iv->base.type_name = "number";
     iv->base.encode = int_value_encode;
     iv->base.decode = int_value_decode;
-    iv->base.cmp = int_value_cmp;
-    iv->base.hash = int_value_hash;
+    iv->base.eq.cmp = int_value_cmp;
+    iv->base.eq.hash = int_value_hash;
     iv->base.to_str = int_value_to_str;
     iv->value = value;
 }
diff --git a/scafi3-mp-api/native/src/main/resources/utils/protobuf_codable.c b/scafi3-mp-api/native/src/main/resources/utils/protobuf_codable.c
@@ -65,8 +65,8 @@ ProtobufValue* protobuf_value_create(
     pv->base.type_name = (char*)message->descriptor->name;
     pv->base.encode = protobuf_encode;
     pv->base.decode = decode_func;
-    pv->base.cmp = protobuf_cmp;
-    pv->base.hash = protobuf_hash;
+    pv->base.eq.cmp = protobuf_cmp;
+    pv->base.eq.hash = protobuf_hash;
     pv->base.to_str = to_str_func ? to_str_func : protobuf_default_to_str;
     pv->message = message;
     pv->descriptor = message->descriptor;
@@ -80,4 +80,4 @@ void protobuf_value_free(ProtobufValue* pv) {
         }
         free(pv);
     }
-}
+}
diff --git a/scafi3-mp-api/native/src/main/resources/utils/protobuf_codable.h b/scafi3-mp-api/native/src/main/resources/utils/protobuf_codable.h
@@ -20,8 +20,17 @@ typedef struct ProtobufValue {
 #define DEFINE_PROTOBUF_MESSAGE(type_name, to_str_func) \
     static char* (*type_name##_to_str_ptr)(const void*) = to_str_func; \
     static const void* decode_##type_name(const uint8_t* buffer, size_t size) { \
-        if (!buffer || size == 0) return NULL; \
-        void* msg = type_name##__unpack(NULL, size, buffer); \
+        if (!buffer) return NULL; \
+        void* msg = NULL; \
+        if (size == 0) { \
+            /* Empty buffer means all fields have default values */ \
+            msg = calloc(1, type_name##__descriptor.sizeof_message); \
+            if (msg) { \
+                ((ProtobufCMessage*)msg)->descriptor = &type_name##__descriptor; \
+            } \
+        } else { \
+            msg = type_name##__unpack(NULL, size, buffer); \
+        } \
         return msg ? protobuf_value_create((ProtobufCMessage*)msg, decode_##type_name, type_name##_to_str_ptr) : NULL; \
     }
 
diff --git a/scafi3-mp-api/native/src/main/scala/it/unibo/scafi/libraries/FullLibrary.scala b/scafi3-mp-api/native/src/main/scala/it/unibo/scafi/libraries/FullLibrary.scala
@@ -6,6 +6,7 @@ import scala.scalanative.unsafe.{ Ptr, Zone }
 
 import it.unibo.scafi.language.AggregateFoundation
 import it.unibo.scafi.language.common.syntax.BranchingSyntax
+import it.unibo.scafi.language.fc.syntax.FieldCalculusSyntax
 import it.unibo.scafi.language.xc.FieldBasedSharedData
 import it.unibo.scafi.language.xc.syntax.ExchangeSyntax
 import it.unibo.scafi.libraries.FullLibrary.libraryRef
@@ -21,7 +22,7 @@ import it.unibo.scafi.types.{ CMap, EqWrapper, NativeTypes }
 
 @SuppressWarnings(Array("scalafix:DisableSyntax.asInstanceOf"))
 class FullLibrary(using
-    lang: AggregateFoundation & ExchangeSyntax & BranchingSyntax & FieldBasedSharedData,
+    lang: AggregateFoundation & ExchangeSyntax & BranchingSyntax & FieldBasedSharedData & FieldCalculusSyntax,
 ) extends FullPortableLibrary
     with NativeFieldBasedSharedData
     with NativeTypes:
@@ -46,6 +47,8 @@ class FullLibrary(using
       libraryRef.get().branch_(condition)(trueBranch)(falseBranch)
     (!lib).exchange = (initial: Ptr[CField], f: Function1[Ptr[CField], ReturnSending]) =>
       libraryRef.get().exchange_(initial)(f)
+    (!lib).share = (initial: Ptr[CBinaryCodable], f: Function1[Ptr[CField], Ptr[CBinaryCodable]]) =>
+      libraryRef.get().share_(initial)(f)
     lib
 end FullLibrary
 
diff --git a/scafi3-mp-api/native/src/main/scala/it/unibo/scafi/message/CBinaryCodable.scala b/scafi3-mp-api/native/src/main/scala/it/unibo/scafi/message/CBinaryCodable.scala
@@ -2,14 +2,22 @@ package it.unibo.scafi.message
 
 import scala.scalanative.unsafe.Ptr
 
-import it.unibo.scafi.nativebindings.structs.BinaryCodable as CBinaryCodable
+import it.unibo.scafi.nativebindings.structs.{ BinaryCodable as CBinaryCodable, Eq as CEq }
 import it.unibo.scafi.utils.CUtils.asVoidPtr
 
 import cats.kernel.Hash
 
+object CEq:
+  export cats.implicits.catsSyntaxEq
+
+  given Hash[Ptr[CEq]] = new Hash[Ptr[CEq]]:
+    override def hash(x: Ptr[CEq]): Int = (!x).hash(x).toInt
+    override def eqv(x: Ptr[CEq], y: Ptr[CEq]): Boolean = (!x).cmp(x, y)
+
 object CBinaryCodable:
+  export cats.implicits.catsSyntaxEq
 
   /** An instance of [[Hash]] for [[it.unibo.scafi.message.CBinaryCodable]]. */
   given Hash[Ptr[CBinaryCodable]] = new Hash[Ptr[CBinaryCodable]]:
-    override def hash(x: Ptr[CBinaryCodable]): Int = (!x).hash(x).toInt
-    override def eqv(x: Ptr[CBinaryCodable], y: Ptr[CBinaryCodable]): Boolean = (!x).cmp(x, y)
+    override def hash(x: Ptr[CBinaryCodable]): Int = (!x)._eq.hash(x).toInt
+    override def eqv(x: Ptr[CBinaryCodable], y: Ptr[CBinaryCodable]): Boolean = (!x)._eq.cmp(x, y)
diff --git a/scafi3-mp-api/native/src/main/scala/it/unibo/scafi/types/CMap.scala b/scafi3-mp-api/native/src/main/scala/it/unibo/scafi/types/CMap.scala
@@ -7,10 +7,14 @@ import scala.language.unsafeNulls
 import scala.scalanative.unsafe.{ exported, CSize, CVoidPtr, Ptr, UnsafeRichLong }
 import scala.scalanative.unsafe.Size.intToSize
 
+import it.unibo.scafi.message.CEq.given
+import it.unibo.scafi.nativebindings.structs.Eq as CEq
+
 /**
  * A facade around a mutable map to be used in C/C++ code via Scala Native. From the C/C++ side, the map is represented
  * as an opaque pointer (`void*`) that acts as a handle to identify the map instance.
  */
+@SuppressWarnings(Array("scalafix:DisableSyntax.asInstanceOf", "scalafix:DisableSyntax.null"))
 object CMap:
 
   private val activeRefs = mutable.Map.empty[Long, mutable.Map[?, ?]]
@@ -21,7 +25,6 @@ object CMap:
     synchronized(activeRefs.update(handle, map))
     handle.toPtr[Byte]
 
-  @SuppressWarnings(Array("scalafix:DisableSyntax.asInstanceOf"))
   def of[Key, Value](ptr: Ptr[Byte]): mutable.Map[Key, Value] =
     val handle = ptr.toLong
     synchronized(activeRefs(handle)).asInstanceOf[mutable.Map[Key, Value]]
@@ -30,10 +33,16 @@ object CMap:
   def empty: Ptr[Byte] = apply(mutable.Map.empty[CVoidPtr, CVoidPtr])
 
   @exported("map_put")
-  def put(handle: Ptr[Byte], key: CVoidPtr, value: CVoidPtr): Unit = of(handle).update(key, value)
+  def put(handle: Ptr[Byte], key: Ptr[CEq], value: CVoidPtr): CVoidPtr =
+    val scalaMap = of[Ptr[CEq], CVoidPtr](handle)
+    val (keyToUpdate, oldValue) = scalaMap.find { case (k, _) => k === key }.fold(key -> null)(identity)
+    scalaMap.update(keyToUpdate, value)
+    oldValue
 
   @exported("map_get")
-  def get(handle: Ptr[Byte], key: CVoidPtr): CVoidPtr = of(handle).get(key).orNull
+  def get(handle: Ptr[Byte], key: Ptr[CEq]): CVoidPtr =
+    val scalaMap = of[Ptr[CEq], CVoidPtr](handle)
+    scalaMap.find { case (k, _) => k === key }.map(_._2).orNull
 
   @exported("map_size")
   def size(handle: Ptr[Byte]): CSize = of(handle).size.toCSize
diff --git a/scafi3-mp-api/shared/src/main/scala/it/unibo/scafi/libraries/FullPortableLibrary.scala b/scafi3-mp-api/shared/src/main/scala/it/unibo/scafi/libraries/FullPortableLibrary.scala
@@ -2,6 +2,7 @@ package it.unibo.scafi.libraries
 
 import it.unibo.scafi.language.AggregateFoundation
 import it.unibo.scafi.language.common.syntax.BranchingSyntax
+import it.unibo.scafi.language.fc.syntax.FieldCalculusSyntax
 import it.unibo.scafi.language.xc.syntax.ExchangeSyntax
 import it.unibo.scafi.types.PortableTypes
 
@@ -10,10 +11,12 @@ import it.unibo.scafi.types.PortableTypes
  * @param lang
  *   the language instance providing the necessary syntaxes for all the libraries.
  */
-trait FullPortableLibrary[Lang <: AggregateFoundation & BranchingSyntax & ExchangeSyntax](using lang: Lang)
-    extends PortableCommonLibrary
+trait FullPortableLibrary[Lang <: AggregateFoundation & BranchingSyntax & ExchangeSyntax & FieldCalculusSyntax](using
+    lang: Lang,
+) extends PortableCommonLibrary
     with PortableBranchingLibrary
-    with PortableExchangeCalculusLibrary:
+    with PortableExchangeCalculusLibrary
+    with PortableFieldCalculusLibrary:
   self: PortableTypes =>
 
   override type Language = Lang
diff --git a/scafi3-mp-api/shared/src/main/scala/it/unibo/scafi/libraries/PortableFieldCalculusLibrary.scala b/scafi3-mp-api/shared/src/main/scala/it/unibo/scafi/libraries/PortableFieldCalculusLibrary.scala
@@ -0,0 +1,16 @@
+package it.unibo.scafi.libraries
+
+import it.unibo.scafi.language.fc.syntax.FieldCalculusSyntax
+import it.unibo.scafi.types.PortableTypes
+
+trait PortableFieldCalculusLibrary extends PortableLibrary:
+  self: PortableTypes =>
+
+  override type Language <: AggregateFoundation & FieldCalculusSyntax
+
+  @JSExport
+  def share[Value](initial: Value)(shareAndReturning: Function1[SharedData[Value], Value]): Value =
+    share_(initial)(shareAndReturning)
+
+  inline def share_[Value](initial: Value)(shareAndReturning: Function1[SharedData[Value], Value]): Value =
+    language.share(initial)(shareAndReturning(_))
