Skip to content

Commit ed22c32

Browse files
authored
Merge pull request #153 from Flow-IPC/shm-31_shm-classic-borrow-range-check
2 parents 74a5119 + 9f4b5ce commit ed22c32

8 files changed

Lines changed: 20 additions & 16 deletions

File tree

.github/workflows/main.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
runs-on: ubuntu-latest
123123
steps:
124124
- name: Checkout VERSION file and tag history
125-
uses: actions/checkout@v4
125+
uses: actions/checkout@v6
126126
with:
127127
sparse-checkout: VERSION
128128
fetch-depth: 0 # Get all history regarding tags. We'll need that for VERSION checking below.
@@ -229,6 +229,7 @@ jobs:
229229
version: 9
230230
c-path: /usr/bin/gcc-9
231231
cpp-path: /usr/bin/g++-9
232+
install: True
232233
- id: gcc-10
233234
name: gcc
234235
version: 10
@@ -628,7 +629,7 @@ jobs:
628629
run: pip install 'conan<2'
629630

630631
- name: Checkout `ipc` repository and submodules (`flow`, `ipc_*`)
631-
uses: actions/checkout@v4
632+
uses: actions/checkout@v6
632633
with:
633634
submodules: true
634635

@@ -903,7 +904,7 @@ jobs:
903904
$BUILT_CMD_PREFIX \
904905
./ipc_session_link_test_srv.exec $OUT_DIR/srv.log > $OUT_DIR/srv.console.log 2>&1 &
905906
SRV_PID=$!
906-
sleep 1
907+
sleep 5
907908
$BUILT_CMD_PREFIX \
908909
./ipc_session_link_test_cli.exec $OUT_DIR/cli.log > $OUT_DIR/cli.console.log 2>&1
909910
if wait $SRV_PID; then SRV_EC=0; else SRV_EC=$?; fi
@@ -927,7 +928,7 @@ jobs:
927928
$BUILT_CMD_PREFIX \
928929
./ipc_shm_link_test_srv.exec $OUT_DIR/srv.log > $OUT_DIR/srv.console.log 2>&1 &
929930
SRV_PID=$!
930-
sleep 1
931+
sleep 5
931932
$BUILT_CMD_PREFIX \
932933
./ipc_shm_link_test_cli.exec $OUT_DIR/cli.log > $OUT_DIR/cli.console.log 2>&1
933934
if wait $SRV_PID; then SRV_EC=0; else SRV_EC=$?; fi
@@ -953,7 +954,7 @@ jobs:
953954
$BUILT_CMD_PREFIX \
954955
./ipc_shm_arena_lend_link_test_srv.exec $OUT_DIR/srv.log > $OUT_DIR/srv.console.log 2>&1 &
955956
SRV_PID=$!
956-
sleep 1
957+
sleep 5
957958
$BUILT_CMD_PREFIX \
958959
./ipc_shm_arena_lend_link_test_cli.exec $OUT_DIR/cli.log > $OUT_DIR/cli.console.log 2>&1
959960
if wait $SRV_PID; then SRV_EC=0; else SRV_EC=$?; fi
@@ -1054,7 +1055,7 @@ jobs:
10541055
$BUILT_CMD_PREFIX \
10551056
./perf_demo_srv_$1.exec 1000 $OUT_DIR/srv.log > $OUT_DIR/srv.console.log 2>&1 &
10561057
SRV_PID=$!
1057-
sleep 20 # It fills up a large structure before listening, so give it some time (mostly for slow build types).
1058+
sleep 40 # It fills up a large structure before listening, so give it some time (mostly for slow build types).
10581059
$BUILT_CMD_PREFIX \
10591060
./perf_demo_cli_$1.exec $OUT_DIR/cli.log > $OUT_DIR/cli.console.log 2>&1
10601061
if wait $SRV_PID; then SRV_EC=0; else SRV_EC=$?; fi
@@ -1106,7 +1107,7 @@ jobs:
11061107
./transport_test.exec scripted $OUT_DIR/srv.log info $1 \
11071108
< srv-script.txt > $OUT_DIR/srv.console.log 2>&1 &
11081109
SRV_PID=$!
1109-
sleep 1
1110+
sleep 5
11101111
$BUILT_CMD_PREFIX \
11111112
./transport_test.exec scripted $OUT_DIR/cli.log info $1 \
11121113
< cli-script.txt > $OUT_DIR/cli.console.log 2>&1 &
@@ -1282,7 +1283,7 @@ jobs:
12821283
- name: Upload test/demo logs (please inspect if failure(s) seen above)
12831284
if: |
12841285
always()
1285-
uses: actions/upload-artifact@v4
1286+
uses: actions/upload-artifact@v7
12861287
with:
12871288
name: ipc-test-logs-${{ matrix.compiler.id }}-${{ matrix.build-test-cfg.id }}-${{ matrix.cxx-std.id }}
12881289
path: ${{ env.install-dir }}/bin/logs.tgz
@@ -1334,9 +1335,11 @@ jobs:
13341335
run: pip install 'conan<2'
13351336

13361337
- name: Checkout `ipc` repository and submodules (like `flow`)
1337-
uses: actions/checkout@v4
1338+
uses: actions/checkout@v6
13381339
with:
13391340
submodules: true
1341+
# Avoids the duplicate-authorization-error in (not-frequently-invoked) doc_check_in step later down.
1342+
persist-credentials: false
13401343

13411344
# In our process (and this is typical, though it is also possible to create tag without release) we
13421345
# hit Publish on a new Release in GitHub; and this creates both the Release and tag, by convention both named
@@ -1474,7 +1477,7 @@ jobs:
14741477
${{ github.workspace }}/build/${{ matrix.build-cfg.conan-profile-build-type }}
14751478
14761479
- name: Upload documentation tarball
1477-
uses: actions/upload-artifact@v4
1480+
uses: actions/upload-artifact@v7
14781481
with:
14791482
name: ipc-doc
14801483
path: ${{ github.workspace }}/doc/ipc_doc.tgz

flow

Submodule flow updated 3271 files

test/suite/unit_test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ set(SRCS
108108
${isal_root}/ipc/shm/arena_lend/test/test_owner_shm_pool_collection.cpp
109109
${isal_root}/ipc/shm/arena_lend/test/test_shm_object.cpp
110110
${isal_root}/ipc/shm/arena_lend/test/test_shm_pool_collection.cpp
111+
${isal_root}/ipc/shm/test/lend_borrow_test.cpp
111112
test_main.cpp)
112113
set(CAPNP_SCHEMAS
113114
${isal_root}/ipc/session/standalone/shm/arena_lend/jemalloc/test/test_message.capnp

0 commit comments

Comments
 (0)