Adjust python module for meson build and fix bug with >16 bytes

parcio · Dec 21, 2020 · 44e13b4 · 44e13b4
1 parent c8b5d8f
commit 44e13b4
Show file tree

Hide file tree

Showing 26 changed files with 67 additions and 71 deletions.
diff --git a/python/benchmark.py b/python/benchmark.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/hello_world.py b/python/hello_world.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/__init__.py b/python/julea/__init__.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -18,7 +18,7 @@
 import pathlib
 
 juleadir = pathlib.Path(__file__).parent.parent.parent
-libdir = juleadir.joinpath('build', 'lib')
+libdir = juleadir.joinpath('bld')
 
 JULEA = ctypes.CDLL(libdir.joinpath('libjulea.so'))
 JULEA_ITEM = ctypes.CDLL(libdir.joinpath('libjulea-item.so'))

diff --git a/python/julea/benchmark/__init__.py b/python/julea/benchmark/__init__.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/benchmark/bench_distributed_object.py b/python/julea/benchmark/bench_distributed_object.py
@@ -1,6 +1,6 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
-# Copyright (C) 2017-2019 Michael Kuhn
+# Copyright (C) 2019-2020 Johannes Coym
+# Copyright (C) 2017-2020 Michael Kuhn
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -80,7 +80,7 @@ def bench_delete(use_batch):
 def bench_status(use_batch):
     n = 1000
     distribution = JDistribution(J_DISTRIBUTION_ROUND_ROBIN)
-    dummy = bytearray(1)
+    dummy = bytes(1)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         o = JDistributedObject("python", "benchmark", distribution)
@@ -110,7 +110,7 @@ def bench_status(use_batch):
 def bench_read(use_batch, block_size):
     n = 25000
     distribution = JDistribution(J_DISTRIBUTION_ROUND_ROBIN)
-    dummy = bytearray(block_size)
+    dummy = bytes(block_size)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         o = JDistributedObject("python", "benchmark", distribution)
@@ -144,7 +144,7 @@ def bench_read(use_batch, block_size):
 def bench_write(use_batch, block_size):
     n = 25000
     distribution = JDistribution(J_DISTRIBUTION_ROUND_ROBIN)
-    dummy = bytearray(block_size)
+    dummy = bytes(block_size)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         o = JDistributedObject("python", "benchmark", distribution)

diff --git a/python/julea/benchmark/bench_item.py b/python/julea/benchmark/bench_item.py
@@ -1,6 +1,6 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
-# Copyright (C) 2010-2019 Michael Kuhn
+# Copyright (C) 2019-2020 Johannes Coym
+# Copyright (C) 2010-2020 Michael Kuhn
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -112,7 +112,7 @@ def bench_delete_batch_without_get():
 
 def bench_status(use_batch):
     n = 1000
-    dummy = bytearray(1)
+    dummy = bytes(1)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         collection = JCollection("benchmark", batch, False)
@@ -142,7 +142,7 @@ def bench_status(use_batch):
 
 def bench_read(use_batch, block_size):
     n = 25000
-    dummy = bytearray(block_size)
+    dummy = bytes(block_size)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         collection = JCollection("benchmark", batch, False)
@@ -177,7 +177,7 @@ def bench_read(use_batch, block_size):
 
 def bench_write(use_batch, block_size):
     n = 25000
-    dummy = bytearray(block_size)
+    dummy = bytes(block_size)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         collection = JCollection("benchmark", batch, False)

diff --git a/python/julea/benchmark/bench_kv.py b/python/julea/benchmark/bench_kv.py
@@ -1,6 +1,6 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
-# Copyright (C) 2017-2019 Michael Kuhn
+# Copyright (C) 2019-2020 Johannes Coym
+# Copyright (C) 2017-2020 Michael Kuhn
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/benchmark/bench_object.py b/python/julea/benchmark/bench_object.py
@@ -1,6 +1,6 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
-# Copyright (C) 2017-2019 Michael Kuhn
+# Copyright (C) 2019-2020 Johannes Coym
+# Copyright (C) 2017-2020 Michael Kuhn
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -72,7 +72,7 @@ def bench_delete(use_batch):
 
 def bench_status(use_batch):
     n = 200000
-    dummy = bytearray(1)
+    dummy = bytes(1)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         o = JObject("python", "benchmark")
@@ -101,7 +101,7 @@ def bench_status(use_batch):
 
 def bench_read(use_batch, block_size):
     n = 200000
-    dummy = bytearray(block_size)
+    dummy = bytes(block_size)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         o = JObject("python", "benchmark")
@@ -132,7 +132,7 @@ def bench_read(use_batch, block_size):
 
 def bench_write(use_batch, block_size):
     n = 200000
-    dummy = bytearray(block_size)
+    dummy = bytes(block_size)
 
     with JBatch(J_SEMANTICS_TEMPLATE_DEFAULT) as batch:
         o = JObject("python", "benchmark")

diff --git a/python/julea/item/__init__.py b/python/julea/item/__init__.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/item/collection.py b/python/julea/item/collection.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/item/item.py b/python/julea/item/item.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -98,19 +98,18 @@ def write(self, value, offset, batch):
         """Writes an item
 
         Args:
-            value: A bytearray holding the data to write
+            value: bytes holding the data to write
             offset: The offset where the data is written
             batch: A batch
         Returns:
             bytes_written: A c_ulonglong with the bytes written
                            (Access with bytes_written.value)
         """
         length = ctypes.c_ulonglong(len(value))
-        value2 = ctypes.create_string_buffer(length.value)
-        value2.raw = value
+        value2 = ctypes.c_char_p(value)
         bytes_written = ctypes.c_ulonglong(0)
         JULEA_ITEM.j_item_write(
-            self.item, ctypes.byref(value2), length, offset,
+            self.item, value2, length, offset,
             ctypes.byref(bytes_written), batch.get_pointer())
         return bytes_written
 
@@ -123,13 +122,13 @@ def read(self, length, offset, batch):
             batch: A batch
         Returns:
             value: The ctype with the data that was read
-                   (Access data with value.raw)
+                   (Access data with value.value)
             bytes_read: A c_ulonglong with the bytes read
                         (Access with bytes_read.value)
         """
-        value = ctypes.create_string_buffer(length)
+        value = ctypes.c_char_p(bytes(length))
         bytes_read = ctypes.c_ulonglong(0)
         JULEA_ITEM.j_item_read(
-            self.item, ctypes.byref(value), length, offset,
+            self.item, value, length, offset,
             ctypes.byref(bytes_read), batch.get_pointer())
         return value, bytes_read
diff --git a/python/julea/kv/__init__.py b/python/julea/kv/__init__.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/kv/kv.py b/python/julea/kv/kv.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -51,13 +51,12 @@ def put(self, value, batch):
         """Writes a Key-Value pair
 
         Args:
-            value: A bytearray of data to be written in the KV pair
+            value: bytes of data to be written in the KV pair
             batch: A batch
         """
         length = ctypes.c_ulong(len(value))
-        value2 = ctypes.create_string_buffer(length.value)
-        value2.raw = value
-        JULEA_KV.j_kv_put(self.kv, ctypes.byref(value2),
+        value2 = ctypes.c_char_p(value)
+        JULEA_KV.j_kv_put(self.kv, value2,
                           length, None, batch.get_pointer())
 
     def get(self, batch):

diff --git a/python/julea/lib/__init__.py b/python/julea/lib/__init__.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/lib/batch.py b/python/julea/lib/batch.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/lib/common.py b/python/julea/lib/common.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/lib/distribution.py b/python/julea/lib/distribution.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/object/__init__.py b/python/julea/object/__init__.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/python/julea/object/distributed_object.py b/python/julea/object/distributed_object.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -79,19 +79,18 @@ def write(self, value, offset, batch):
         """Writes an object
 
         Args:
-            value: A bytearray holding the data to write
+            value: bytes holding the data to write
             offset: The offset where the data is written
             batch: A batch
         Returns:
             bytes_written: A c_ulonglong with the bytes written
                            (Access with bytes_written.value)
         """
         length = ctypes.c_ulonglong(len(value))
-        value2 = ctypes.create_string_buffer(length.value)
-        value2.raw = value
+        value2 = ctypes.c_char_p(value)
         bytes_written = ctypes.c_ulonglong(0)
         JULEA_OBJECT.j_distributed_object_write(
-            self.object, ctypes.byref(value2), length, offset,
+            self.object, value2, length, offset,
             ctypes.byref(bytes_written), batch.get_pointer())
         return bytes_written
 
@@ -104,13 +103,13 @@ def read(self, length, offset, batch):
             batch: A batch
         Returns:
             value: The ctype with the data that was read
-                   (Access data with value.raw)
+                   (Access data with value.value)
             bytes_read: A c_ulonglong with the bytes read
                         (Access with bytes_read.value)
         """
-        value = ctypes.create_string_buffer(length)
+        value = ctypes.c_char_p(bytes(length))
         bytes_read = ctypes.c_ulonglong(0)
         JULEA_OBJECT.j_distributed_object_read(
-            self.object, ctypes.byref(value), length, offset,
+            self.object, value, length, offset,
             ctypes.byref(bytes_read), batch.get_pointer())
         return value, bytes_read
diff --git a/python/julea/object/object.py b/python/julea/object/object.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -75,19 +75,18 @@ def write(self, value, offset, batch):
         """Writes an object
 
         Args:
-            value: A bytearray holding the data to write
+            value: bytes holding the data to write
             offset: The offset where the data is written
             batch: A batch
         Returns:
             bytes_written: A c_ulonglong with the bytes written
                            (Access with bytes_written.value)
         """
         length = ctypes.c_ulonglong(len(value))
-        value2 = ctypes.create_string_buffer(length.value)
-        value2.raw = value
+        value2 = ctypes.c_char_p(value)
         bytes_written = ctypes.c_ulonglong(0)
         JULEA_OBJECT.j_object_write(
-            self.object, ctypes.byref(value2), length, offset,
+            self.object, value2, length, offset,
             ctypes.byref(bytes_written), batch.get_pointer())
         return bytes_written
 
@@ -100,13 +99,13 @@ def read(self, length, offset, batch):
             batch: A batch
         Returns:
             value: The ctype with the data that was read
-                   (Access data with value.raw)
+                   (Access data with value.value)
             bytes_read: A c_ulonglong with the bytes read
                         (Access with bytes_read.value)
         """
-        value = ctypes.create_string_buffer(length)
+        value = ctypes.c_char_p(bytes(length))
         bytes_read = ctypes.c_ulonglong(0)
         JULEA_OBJECT.j_object_read(
-            self.object, ctypes.byref(value), length, offset,
+            self.object, value, length, offset,
             ctypes.byref(bytes_read), batch.get_pointer())
         return value, bytes_read
diff --git a/python/julea/test/__init__.py b/python/julea/test/__init__.py
@@ -1,5 +1,5 @@
 # JULEA - Flexible storage framework
-# Copyright (C) 2019 Johannes Coym
+# Copyright (C) 2019-2020 Johannes Coym
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by