more fixes

danielhrisca · Jun 25, 2024 · dcec26e · dcec26e
1 parent db717ca
commit dcec26e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/src/asammdf/blocks/cutils.c b/src/asammdf/blocks/cutils.c
@@ -1382,8 +1382,12 @@ static PyObject *data_block_from_arrays(PyObject *self, PyObject *args)
                     write_pos += step;
                 }
             }
+
+            free(block_info);
         }
 
+        data_blocks = item = bytes = itemsize = NULL;
+
         return out;
     }
 }

diff --git a/src/asammdf/blocks/mdf_v4.py b/src/asammdf/blocks/mdf_v4.py
@@ -2857,7 +2857,6 @@ def append(
 
                 gp_sig_types.append(v4c.SIGNAL_TYPE_SCALAR)
 
-        c = 0
         for signal in signals:
             sig = signal
             samples = sig.samples
@@ -3000,7 +2999,6 @@ def append(
                     gp_dep.append(None)
 
                 else:
-                    c += 1
                     byte_size = s_size // 8 or 1
                     data_block_addr = 0
 
@@ -3360,14 +3358,13 @@ def append(
                     "flags": 0,
                 }
 
-                if invalidation_bytes_nr:
-                    if signal.invalidation_bits is not None:
-                        if (origin := signal.invalidation_bits.origin) == InvalidationArray.ORIGIN_UNKNOWN:
-                            inval_bits[origin].append(signal.invalidation_bits)
-                        else:
-                            inval_bits[origin] = signal.invalidation_bits
-                        kwargs["flags"] = v4c.FLAG_CN_INVALIDATION_PRESENT
-                        kwargs["pos_invalidation_bit"] = origin
+                if invalidation_bytes_nr and signal.invalidation_bits is not None:
+                    if (origin := signal.invalidation_bits.origin) == InvalidationArray.ORIGIN_UNKNOWN:
+                        inval_bits[origin].append(signal.invalidation_bits)
+                    else:
+                        inval_bits[origin] = signal.invalidation_bits
+                    kwargs["flags"] = v4c.FLAG_CN_INVALIDATION_PRESENT
+                    kwargs["pos_invalidation_bit"] = origin
 
                 ch = Channel(**kwargs)
                 ch.name = name
@@ -3446,14 +3443,13 @@ def append(
                         "flags": 0,
                     }
 
-                    if invalidation_bytes_nr:
-                        if signal.invalidation_bits is not None:
-                            if (origin := signal.invalidation_bits.origin) == InvalidationArray.ORIGIN_UNKNOWN:
-                                inval_bits[origin].append(signal.invalidation_bits)
-                            else:
-                                inval_bits[origin] = signal.invalidation_bits
-                            kwargs["flags"] = v4c.FLAG_CN_INVALIDATION_PRESENT
-                            kwargs["pos_invalidation_bit"] = origin
+                    if invalidation_bytes_nr and signal.invalidation_bits is not None:
+                        if (origin := signal.invalidation_bits.origin) == InvalidationArray.ORIGIN_UNKNOWN:
+                            inval_bits[origin].append(signal.invalidation_bits)
+                        else:
+                            inval_bits[origin] = signal.invalidation_bits
+                        kwargs["flags"] = v4c.FLAG_CN_INVALIDATION_PRESENT
+                        kwargs["pos_invalidation_bit"] = origin
 
                     ch = Channel(**kwargs)
                     ch.name = name
@@ -5872,8 +5868,8 @@ def extend(self, index: int, signals: list[tuple[NDArray[Any], NDArray[Any] | No
                 for dim in shape:
                     size *= dim
 
-                if not signal.flags["C_CONTIGUOUS"]:
-                    signal = np.ascontiguousarray(signal)
+                if not samples.flags["C_CONTIGUOUS"]:
+                    samples = np.ascontiguousarray(samples)
 
                 fields.append((samples, size))
 
@@ -5891,8 +5887,8 @@ def extend(self, index: int, signals: list[tuple[NDArray[Any], NDArray[Any] | No
                     for dim in shape:
                         size *= dim
 
-                    if not signal.flags["C_CONTIGUOUS"]:
-                        signal = np.ascontiguousarray(signal)
+                    if not samples.flags["C_CONTIGUOUS"]:
+                        samples = np.ascontiguousarray(samples)
 
                     fields.append((samples, size))
 
@@ -5981,6 +5977,7 @@ def extend(self, index: int, signals: list[tuple[NDArray[Any], NDArray[Any] | No
                     else:
                         inval_bits[origin] = invalidation_bits
 
+        # print('inval')
         if invalidation_bytes_nr:
             unknown_origin = inval_bits.pop(InvalidationArray.ORIGIN_UNKNOWN)