From 9b411ceb1aeb88b8ce8c5ddfcc4809edeb184d3b Mon Sep 17 00:00:00 2001
From: MoezBHH <moez.benhajhmida@gmail.com>
Date: Thu, 5 Dec 2024 23:56:00 +0100
Subject: [PATCH 1/3] Update trace_impl.c

Fix the compile error on issue 2398.
---
 trace/impl/src/trace_impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trace/impl/src/trace_impl.c b/trace/impl/src/trace_impl.c
index 02ffbb3bd..f819507c4 100644
--- 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;

From cdec23d3549a265f6c4ede0f0e9f29a0d9b3867c Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@berkeley.edu>
Date: Thu, 5 Dec 2024 15:12:31 -0800
Subject: [PATCH 2/3] Point reactor-c to lingua-franca master

---
 lingua-franca-ref.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt
index edf165c42..8b25206ff 100644
--- a/lingua-franca-ref.txt
+++ b/lingua-franca-ref.txt
@@ -1 +1 @@
-fix-concurrency
\ No newline at end of file
+master
\ No newline at end of file

From 97a63742de67b8c3a1aafaa8292f34b720740498 Mon Sep 17 00:00:00 2001
From: "Edward A. Lee" <eal@berkeley.edu>
Date: Thu, 5 Dec 2024 15:29:08 -0800
Subject: [PATCH 3/3] Temporarily disabling flexpret tests, which fail to run.

---
 .github/workflows/ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd12b4eff..634c6d120 100644
--- 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]