Skip to content

Commit 58da8c3

Browse files
authored
Merge branch 'master' into cascadedAllocator
2 parents b84e0c4 + 13acc82 commit 58da8c3

250 files changed

Lines changed: 6973 additions & 5555 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ assignees: ''
77

88
---
99

10+
All support on github is best effort only, no guarantees given. When you need guaranteed support have a look at the commercial support offerings as listed at https://github.com/DOCGroup/ACE_TAO/wiki/ACE-and-TAO-Commercial-support.
11+
1012
### Version
1113

1214
The version of ACE and/or TAO you are using
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: linux-container
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
build:
19+
strategy:
20+
fail-fast: false
21+
runs-on: ubuntu-22.04
22+
name: alpine-3.18
23+
env:
24+
ACE_ROOT: ${{ github.workspace }}/ACE
25+
TAO_ROOT: ${{ github.workspace }}/TAO
26+
MPC_ROOT: ${{ github.workspace }}/MPC
27+
steps:
28+
- name: Checkout ACE_TAO
29+
uses: actions/checkout@v4
30+
- name: Checkout MPC
31+
uses: actions/checkout@v4
32+
with:
33+
repository: DOCGroup/MPC
34+
path: ${{ env.MPC_ROOT }}
35+
- name: Write configuation files
36+
run: |
37+
echo '#include "ace/config-linux.h"' > ${{ env.ACE_ROOT }}/ace/config.h
38+
echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > ${{ env.ACE_ROOT }}/include/makeinclude/platform_macros.GNU
39+
- name: Build in container
40+
uses: addnab/docker-run-action@v3
41+
with:
42+
image: alpine:3.18
43+
options: -v ${{ github.workspace }}:${{ github.workspace }}
44+
run: |
45+
apk add --no-cache git bash make g++ perl linux-headers
46+
export ACE_ROOT=${{ env.ACE_ROOT }}
47+
export TAO_ROOT=${{ env.TAO_ROOT }}
48+
export MPC_ROOT=${{ env.MPC_ROOT }}
49+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/TAO_ACE.mwc -workers 4
50+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.ACE_ROOT }}/tests/tests.mwc -workers 4
51+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDL_Test -workers 4
52+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDLv4 -workers 4
53+
make -j 6 -C ${{ env.TAO_ROOT }}
54+
make -j 6 -C ${{ env.ACE_ROOT }}/tests
55+
make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDL_Test
56+
make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDLv4

.github/workflows/linux.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
PackageDeps: g++-13
6363
optional_macros: c++std=c++20
6464
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
65-
os: ubuntu-22.04
65+
os: ubuntu-24.04
6666
- CC: clang-6.0
6767
CXX: clang++-6.0
6868
PackageDeps: clang-6.0
@@ -120,6 +120,12 @@ jobs:
120120
Repo: llvm-toolchain-$(lsb_release -cs)-15
121121
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
122122
os: ubuntu-22.04
123+
- CC: clang-16
124+
CXX: clang++-16
125+
PackageDeps: clang-16
126+
Repo: llvm-toolchain-$(lsb_release -cs)-16
127+
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
128+
os: ubuntu-22.04
123129
- feature: CORBA/e micro
124130
CC: gcc-10
125131
CXX: g++-10

.github/workflows/macosx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: [macos-11, macos-12]
22+
os: [macos-13, macos-14]
2323
include:
2424
- platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
2525
runs-on: ${{ matrix.os }}

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
- name: Install vcpkg
132132
uses: lukka/run-vcpkg@v11
133133
with:
134-
vcpkgGitCommitId: c8696863d371ab7f46e213d8f5ca923c4aef2a00
134+
vcpkgGitCommitId: c82f74667287d3dc386bce81e44964370c91a289
135135
runVcpkgInstall: true
136136
- name: create $ACE_ROOT/ace/config.h
137137
run: |
@@ -164,7 +164,7 @@ jobs:
164164
perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/tests/IDL_Test -workers 4 ${{ matrix.OptionalMpcArgs }}
165165
shell: pwsh
166166
- name: Setup msbuild
167-
uses: microsoft/setup-msbuild@v1
167+
uses: microsoft/setup-msbuild@v2
168168
- name: Build solution TAO/TAO_ACE.sln
169169
run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln
170170
- name: Build solution ACE/tests/tests.sln

ACE/ACE-INSTALL.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
427427
</li>
428428
<li>If you've set the INSTALL_PREFIX before building, now run
429429
<blockquote><code>% make install</code></blockquote>
430-
<p>An alternative to directly running <code>make install</make> is to use <code>$ACE_ROOT/bin/install_proj.sh</code>
430+
<p>An alternative to directly running <code>make install</code> is to use <code>$ACE_ROOT/bin/install_proj.sh</code>
431431
which will only install projects that are built (instead of trying to build each one during <code>make install</code>).
432432
</p>
433433
</li>
@@ -679,9 +679,9 @@ <h3><a name="embarcadero">Building and Installing ACE on Windows with Embarcader
679679
<code>set CODEGUARD=1</code><br>
680680
<br>
681681
Set one of the following environment variable to 1 to select which Embarcadero
682-
C++ compiler has to be used. Valid environment variables are BCC32, BCC32C, and BCC64.
682+
C++ compiler has to be used. Valid environment variables are <code>BCC32C</code>, <code>BCC64</code>, and <code>BCC64X</code>.
683683
<br>
684-
<code>set BCC32=1</code><br>
684+
<code>set BCC64X=1</code><br><br>
685685
You can then start the build with the command
686686
<br><code>make -f Makefile.bmak all</code><br>
687687
<br>

ACE/ChangeLogs/ACE-7_1_3

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
commit 06c65e4ec63d867b08b28524e65d404397c15d98
2+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
3+
Date: Mon Jan 15 11:07:27 2024 +0100
4+
5+
List changes
6+
7+
* ACE/NEWS:
8+
9+
commit 56d5db9cd27ab6fb7aa88809f097daf94f8ef232
10+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
11+
Date: Mon Jan 15 09:44:35 2024 +0100
12+
13+
Some modernization, use default, nullptr, const
14+
15+
* ACE/ace/Barrier.cpp:
16+
* ACE/ace/Future.cpp:
17+
* ACE/ace/Future.h:
18+
* ACE/ace/Future_Set.cpp:
19+
20+
commit 0af46b720336d28f2b248d781d98f6a5ddf22158
21+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
22+
Date: Sun Jan 14 13:03:11 2024 +0100
23+
24+
Add include for std::atomic
25+
26+
* ACE/ace/Future.h:
27+
28+
commit 6695073ad566bbcb5a4e8dd186308dd7e2911af3
29+
Merge: b94f1dc4f62 8c49e7b9d4c
30+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
31+
Date: Sun Jan 14 13:01:17 2024 +0100
32+
33+
Merge branch 'master' into #2163-Race-condition-in-ACE_Future-double-checked-locking-pattern-code
34+
35+
commit 4689fd055bff2c4280c6f0b8d81856b7e0bba666
36+
Merge: 4939d6b7232 7efcd5faa4d
37+
Author: Steve Huston <shuston@riverace.com>
38+
Date: Fri Jan 12 16:18:47 2024 -0500
39+
40+
Merge branch 'master' into barrier_concurrency_fail
41+
42+
commit b94f1dc4f622111ede7d06f0af70d39ff35056d7
43+
Author: Frank Hilliger <frank.hilliger@cs-sol.de>
44+
Date: Wed Jan 10 11:31:12 2024 +0100
45+
46+
Fixed failed quality gates: C-style pointer casting
47+
48+
commit 8ff73f4b883da21c5de3c53a0d9ef943e3757edd
49+
Author: Frank Hilliger <frank.hilliger@cs-sol.de>
50+
Date: Wed Jan 10 08:38:47 2024 +0100
51+
52+
fixed findings of trailing_whitespaces check
53+
54+
commit 13cafcfb76ed29d6687b5c8a7211e40dd142e944
55+
Author: Frank Hilliger <frank.hilliger@cs-sol.de>
56+
Date: Tue Jan 9 18:08:47 2024 +0100
57+
58+
#2179: Fixed a race condition caused by the double checked locking pattern
59+
- test case
60+
61+
commit 30ab3c0586b7413490e98f181f4db0528c3f2119
62+
Author: nfrmtkr <frank.hilliger@cs-sol.de>
63+
Date: Mon Jan 8 10:03:39 2024 +0100
64+
65+
Update Future.h
66+
67+
Fixed a race condition caused by the double checked locking pattern by using an std::atomic that ensures correct and deterministic create and assignment logic.
68+
69+
commit 58ea863f3a2e50b6a3045b59c7f1f060a8b7b5ae
70+
Merge: 587a7279b17 4df4192f41c
71+
Author: Justin Wilson <wilsonj@unityfoundation.io>
72+
Date: Wed Dec 13 13:17:38 2023 -0600
73+
74+
Merge pull request #2171 from mitza-oci/install_proj
75+
76+
Added a script install_proj.sh that can be used to run make install
77+
78+
commit ee67b0516f51c3d722989e4b0e735dc1ae5596c6
79+
Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
80+
Date: Wed Dec 13 14:15:40 2023 +0000
81+
82+
Sync debian/* files for ACE
83+
84+
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
85+
86+
commit 4df4192f41c078099fddbbad68d212263137184f
87+
Author: Adam Mitz <mitza@objectcomputing.com>
88+
Date: Fri Dec 8 12:18:25 2023 -0600
89+
90+
Added a script install_proj.sh that can be used to run make install
91+
92+
commit 4939d6b723293824d970788a7726b222cdf8ca2b
93+
Author: Steve Huston <shuston@riverace.com>
94+
Date: Fri Dec 1 22:04:44 2023 +0000
95+
96+
Change to C++ std::atomic
97+
98+
commit 7e06ab1addf4df12d774fbb1a4fdf44b1d03ae39
99+
Author: Steve Huston <shuston@riverace.com>
100+
Date: Fri Dec 1 17:59:11 2023 +0000
101+
102+
Change running_count_ to atomic to ensure accurate values across cores/CPUs.
103+
104+
commit 160a687e5c78f0d83099c068e3cd051af7e25824
105+
Author: Marcin Cieślak <saper@saper.info>
106+
Date: Sat Nov 25 03:06:02 2023 +0100
107+
108+
Build on FreeBSD 15.0
109+
110+
ACE builds now with __FreeBSD_version 1500001
111+
112+
commit f2bfbf8ce64ec3d34aa9ad369f9515be3b33ae59
113+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
114+
Date: Wed Nov 22 11:16:44 2023 +0100
115+
116+
Identation change
117+
118+
* ACE/ace/Future.cpp:
119+
120+
commit c80d23d1123788cc4497376fb2a26b6dffb48d7c
121+
Merge: bd35628db2f 527ba7711f6
122+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
123+
Date: Thu Nov 9 09:07:04 2023 +0100
124+
125+
Merge branch 'master' into jwi-nonconstcmsgspace
126+
127+
commit bd35628db2ff60209d947222f4c1adaac412a841
128+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
129+
Date: Thu Nov 9 09:05:58 2023 +0100
130+
131+
Add support for a non const CMSG_SPACE macro, some code is disabled at that moment
132+
133+
* ACE/ace/SOCK_Dgram.cpp:
134+
* ACE/ace/config-qnx.h:
135+
136+
commit 1b2a86a2057f96fff3d72e8d2269d6b68c3a8da5
137+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
138+
Date: Mon Oct 30 08:23:58 2023 +0100
139+
140+
Next release
141+
142+
* ACE/bin/copy-local-script.sh:
143+
144+
commit c9c19d844a1ca78ab287023c48ffa2e740c8bfc2
145+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
146+
Date: Mon Oct 30 08:22:34 2023 +0100
147+
148+
Make x.1.2 publicly available
149+
150+
* ACE/NEWS:
151+
* ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
152+
* ACE/docs/Download.html:
153+
* ACE/etc/index.html:
154+
* TAO/NEWS:

0 commit comments

Comments
 (0)