Merge branch 'main' into user-start-time

lf-lang · Dec 7, 2024 · f6609b7 · f6609b7
2 parents f8d45a4 + f505260
commit f6609b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,13 +55,13 @@ jobs:
       compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
     if: ${{ !github.event.pull_request.draft ||contains( github.event.pull_request.labels.*.name, 'zephyr') }}
 
-  lf-default-flexpret:
-   needs: [fetch-lf]
-   uses: lf-lang/lingua-franca/.github/workflows/c-flexpret-tests.yml@master
-   with:
-     runtime-ref: ${{ github.ref }}
-     compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
-   if: ${{ !github.event.pull_request.draft ||contains( github.event.pull_request.labels.*.name, 'flexpret') }}
+#  lf-default-flexpret:
+#   needs: [fetch-lf]
+#   uses: lf-lang/lingua-franca/.github/workflows/c-flexpret-tests.yml@master
+#   with:
+#     runtime-ref: ${{ github.ref }}
+#     compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
+#   if: ${{ !github.event.pull_request.draft ||contains( github.event.pull_request.labels.*.name, 'flexpret') }}
 
   lf-default:
     needs: [fetch-lf]

diff --git a/trace/impl/src/trace_impl.c b/trace/impl/src/trace_impl.c
@@ -153,7 +153,7 @@ static void start_trace(trace_t* t, int max_num_local_threads) {
     t->_lf_trace_buffer[i] = (trace_record_nodeps_t*)malloc(sizeof(trace_record_nodeps_t) * TRACE_BUFFER_CAPACITY);
   }
   // Array of counters that track the size of each trace record (per thread).
-  t->_lf_trace_buffer_size = (size_t*)calloc(sizeof(size_t), t->_lf_number_of_trace_buffers + 1);
+  t->_lf_trace_buffer_size = (size_t*)calloc(t->_lf_number_of_trace_buffers + 1, sizeof(size_t));
   t->_lf_trace_buffer_size++;
 
   t->_lf_trace_stop = 0;