sdfgen 0.21.0__cp312-cp312-macosx_14_0_arm64.whl → 0.23.0__cp312-cp312-macosx_14_0_arm64.whl

sdfgen/module.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import ctypes
 import importlib.util
 from ctypes import (
-    cast, c_void_p, c_char_p, c_int8, c_uint8, c_uint32, c_uint64, c_bool, POINTER, byref, pointer
+    cast, c_void_p, c_char_p, c_int8, c_uint8, c_uint16, c_uint32, c_uint64, c_bool, POINTER, byref, pointer
 )
 from typing import Optional, List, Tuple
 from enum import IntEnum
@@ -103,6 +103,10 @@ libsdfgen.sdfgen_vm_destroy.argtypes = [c_void_p]
 
 libsdfgen.sdfgen_vm_set_priority.restype = None
 libsdfgen.sdfgen_vm_set_priority.argtypes = [c_void_p, c_uint8]
+libsdfgen.sdfgen_vm_set_budget.restype = None
+libsdfgen.sdfgen_vm_set_budget.argtypes = [c_void_p, c_uint32]
+libsdfgen.sdfgen_vm_set_period.restype = None
+libsdfgen.sdfgen_vm_set_period.argtypes = [c_void_p, c_uint32]
 
 libsdfgen.sdfgen_vm_add_map.restype = None
 libsdfgen.sdfgen_vm_add_map.argtypes = [c_void_p, c_void_p]
@@ -156,7 +160,7 @@ libsdfgen.sdfgen_sddf_blk_destroy.restype = None
 libsdfgen.sdfgen_sddf_blk_destroy.argtypes = [c_void_p]
 
 libsdfgen.sdfgen_sddf_blk_add_client.restype = c_uint32
-libsdfgen.sdfgen_sddf_blk_add_client.argtypes = [c_void_p, c_void_p, c_uint32]
+libsdfgen.sdfgen_sddf_blk_add_client.argtypes = [c_void_p, c_void_p, c_uint32, POINTER(c_uint16), POINTER(c_uint32)]
 
 libsdfgen.sdfgen_sddf_blk_connect.restype = c_bool
 libsdfgen.sdfgen_sddf_blk_connect.argtypes = [c_void_p]
@@ -203,7 +207,7 @@ libsdfgen.sdfgen_sddf_gpu_destroy.restype = None
 libsdfgen.sdfgen_sddf_gpu_destroy.argtypes = [c_void_p]
 
 libsdfgen.sdfgen_sddf_gpu_add_client.restype = c_uint32
-libsdfgen.sdfgen_sddf_gpu_add_client.argtypes = [c_void_p, c_void_p, c_uint32]
+libsdfgen.sdfgen_sddf_gpu_add_client.argtypes = [c_void_p, c_void_p]
 
 libsdfgen.sdfgen_sddf_gpu_connect.restype = c_bool
 libsdfgen.sdfgen_sddf_gpu_connect.argtypes = [c_void_p]
@@ -302,6 +306,17 @@ def ffi_uint8_ptr(n: Optional[int]):
     return pointer(c_uint8(n))
 
 
+def ffi_uint16_ptr(n: Optional[int]):
+    """
+    Convert an int value to a uint16_t pointer for FFI.
+    If 'n' is None then we return None (which acts as a null pointer)
+    """
+    if n is None:
+        return None
+
+    return pointer(c_uint16(n))
+
+
 def ffi_uint32_ptr(n: Optional[int]):
     """
     Convert an int value to a uint32_t pointer for FFI.
@@ -489,7 +504,14 @@ class SystemDescription:
             def __init__(self, *, id: int, cpu: Optional[int] = None):
                 self._obj = libsdfgen.sdfgen_vm_vcpu_create(id, ffi_uint8_ptr(cpu))
 
-        def __init__(self, name: str, vcpus: List[Vcpu], priority: Optional[int] = None):
+        def __init__(
+            self,
+            name: str,
+            vcpus: List[Vcpu],
+            priority: Optional[int] = None,
+            budget: Optional[int] = None,
+            period: Optional[int] = None,
+        ):
             vcpus_tuple: Tuple[c_void_p] = tuple([vcpu._obj for vcpu in vcpus])
             c_vcpus = (c_void_p * len(vcpus))(*vcpus_tuple)
             c_name = c_char_p(name.encode("utf-8"))
@@ -499,6 +521,10 @@ class SystemDescription:
                 raise Exception("failed to create VM")
             if priority is not None:
                 libsdfgen.sdfgen_vm_set_priority(self._obj, priority)
+            if budget is not None:
+                libsdfgen.sdfgen_vm_set_budget(self._obj, budget)
+            if period is not None:
+                libsdfgen.sdfgen_vm_set_period(self._obj, period)
 
         @property
         def name(self) -> str:
@@ -513,32 +539,28 @@ class SystemDescription:
     class Map:
         _obj: c_void_p
 
-        class Perms:
-            def __init__(self, *, r: bool = False, w: bool = False, x: bool = False):
-                self.read = r
-                self.write = w
-                self.execute = x
-
-            def _to_c_bindings(self) -> int:
-                c_perms = 0
-                if self.read:
-                    c_perms |= 0b001
-                if self.write:
-                    c_perms |= 0b010
-                if self.execute:
-                    c_perms |= 0b100
+        @staticmethod
+        def _perms_to_c_bindings(s: str) -> int:
+            c_perms = 0
+            if "r" in s:
+                c_perms |= 0b001
+            if "w" in s:
+                c_perms |= 0b010
+            if "x" in s:
+                c_perms |= 0b100
 
-                return c_perms
+            return c_perms
 
         def __init__(
             self,
             mr: SystemDescription.MemoryRegion,
             vaddr: int,
-            perms: Perms,
+            perms: str,
             *,
             cached: bool = True,
         ) -> None:
-            self._obj = libsdfgen.sdfgen_map_create(mr._obj, vaddr, perms._to_c_bindings(), cached)
+            c_perms = SystemDescription.Map._perms_to_c_bindings(perms)
+            self._obj = libsdfgen.sdfgen_map_create(mr._obj, vaddr, c_perms, cached)
             if self._obj is None:
                 raise Exception("failed to create mapping")
 
@@ -802,8 +824,21 @@ class Sddf:
             if self._obj is None:
                 raise Exception("failed to create blk system")
 
-        def add_client(self, client: SystemDescription.ProtectionDomain, *, partition: int):
-            ret = libsdfgen.sdfgen_sddf_blk_add_client(self._obj, client._obj, partition)
+        def add_client(
+            self,
+            client: SystemDescription.ProtectionDomain,
+            *,
+            partition: int,
+            queue_capacity: Optional[int] = None,
+            data_size: Optional[int] = None
+        ):
+            ret = libsdfgen.sdfgen_sddf_blk_add_client(
+                self._obj,
+                client._obj,
+                partition,
+                ffi_uint16_ptr(queue_capacity),
+                ffi_uint32_ptr(data_size)
+            )
             if ret == SddfStatus.OK:
                 return
             elif ret == SddfStatus.DUPLICATE_CLIENT:

{sdfgen-0.21.0.dist-info → sdfgen-0.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: sdfgen
-Version: 0.21.0
+Version: 0.23.0
 Summary: Automating the creation of Microkit System Description Files (SDF)
 Home-page: https://github.com/au-ts/microkit_sdf_gen
 Description-Content-Type: text/markdown
@@ -17,8 +17,9 @@ Microkit-based systems.
 > [!IMPORTANT]
 > This project is experimental, we are using it internally to get it into a
 > usable state for the public. For development this work exists in a separate
-> repository, but that may change once it has matured (e.g by being apart of the
-> official Microkit repository).
+> repository, but that may change once it has matured (e.g by the Microkit part
+> of the tooling part of the official Microkit repository, the sDDF part being
+> in the sDDF repository, etc).
 
 ## Use
 
@@ -49,10 +50,7 @@ Pre-built archives of the C library are available in each
 
 ### Dependencies
 
-* Zig (`0.14.0-dev.3050+d72f3d353` or higher)
-  * See https://ziglang.org/download/, until 0.14.0 is released we rely on a
-    master version of Zig. Once 0.14.0 is released (most likely Feb'25) we can
-    pin to that release.
+* [Zig 0.14.0](https://ziglang.org/download)
 
 ### C library (libcsdfgen)
 

sdfgen-0.23.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+csdfgen.cpython-312-darwin.so,sha256=o3YqFpECb4-CHmHS4efckqc6tXNeTU0U_2fpNfVnRkw,863608
+libcsdfgen.0.23.0.dylib,sha256=o3YqFpECb4-CHmHS4efckqc6tXNeTU0U_2fpNfVnRkw,863608
+libcsdfgen.0.dylib,sha256=o3YqFpECb4-CHmHS4efckqc6tXNeTU0U_2fpNfVnRkw,863608
+libcsdfgen.dylib,sha256=o3YqFpECb4-CHmHS4efckqc6tXNeTU0U_2fpNfVnRkw,863608
+sdfgen/__init__.py,sha256=_d7GGV8GhadIAEYP8uiJlez0yKtXnHMHdRkRzVMKS3c,143
+sdfgen/module.py,sha256=cSiUZFdti5PtaqWLWA2sEmtkqgE8Bf0qzPNDW2dcfZs,45021
+sdfgen/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sdfgen-0.23.0.dist-info/METADATA,sha256=u_squeTY8tciegseUvvMluk4sOuiFGm5KYF6gL1zbRk,4549
+sdfgen-0.23.0.dist-info/WHEEL,sha256=Duh07W_64_yan9sqf6ToaLAzjDscOfQBCYC6FAxuAVY,109
+sdfgen-0.23.0.dist-info/top_level.txt,sha256=M3gUW9vTMij10peQKgv1Qs0jZkdsk_PG0REFxuv6jNY,15
+sdfgen-0.23.0.dist-info/RECORD,,

{sdfgen-0.21.0.dist-info → sdfgen-0.23.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (77.0.1)
 Root-Is-Purelib: false
 Tag: cp312-cp312-macosx_14_0_arm64
 

sdfgen-0.21.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-csdfgen.cpython-312-darwin.so,sha256=WmQZjIMKT3eME7AxFQRkWM2nzww2et0EWJhShVVi_z0,863384
-libcsdfgen.0.21.0.dylib,sha256=WmQZjIMKT3eME7AxFQRkWM2nzww2et0EWJhShVVi_z0,863384
-libcsdfgen.0.dylib,sha256=WmQZjIMKT3eME7AxFQRkWM2nzww2et0EWJhShVVi_z0,863384
-libcsdfgen.dylib,sha256=WmQZjIMKT3eME7AxFQRkWM2nzww2et0EWJhShVVi_z0,863384
-sdfgen/__init__.py,sha256=_d7GGV8GhadIAEYP8uiJlez0yKtXnHMHdRkRzVMKS3c,143
-sdfgen/module.py,sha256=xV75IHPGivRXij-DriZFiUTrtWs5hpRUhryMdmQ99C8,44021
-sdfgen/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sdfgen-0.21.0.dist-info/METADATA,sha256=iycD4r1V3CoTlEPAWoUI_87zkgyoVgChvBvLRrwLD4A,4654
-sdfgen-0.21.0.dist-info/WHEEL,sha256=eAqXk-QNBMa5-MfZIK8Gt6rbgF1MQwY75KCK1Npp_q0,109
-sdfgen-0.21.0.dist-info/top_level.txt,sha256=M3gUW9vTMij10peQKgv1Qs0jZkdsk_PG0REFxuv6jNY,15
-sdfgen-0.21.0.dist-info/RECORD,,