Skip to content

Commit aa6e5df

Browse files
mariomastrodicasagithub-actions[bot]
mariomastrodicasa
and
github-actions[bot]
authored
Updates and refininings on version 1.1 (#10)
* Fixed condition when channelName is NULL * Update OpenDDS to version 3.16 * Added logs on CommonDataReaderListenerImpl callbacks * Update OpenDDS to version 3.16: missing submodule change on previous commit * #6: removed windows types from interfaces, moved thread/events/lock into support classes * #6: added IDataDistributionChannel class to avoid generic void* for CHANNEL_HANDLE * #6: removed unused header files and other direct windows API * #7: updates on documentation * Review of MastershipManager, moved outside main library, added parameter management * Added MastershipConfiguration for configuration management * Update behavior of create channel Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent f0b52e8 commit aa6e5df

File tree

352 files changed

+11713
-56838
lines changed

Some content is hidden

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

352 files changed

+11713
-56838
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
id: existsOpenDDS
2727
continue-on-error: true
2828
run: |
29-
python $GITHUB_WORKSPACE/third_party/CommonTools/scripts/utilsftp.py -c check -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Build_3.15.zip -l $GITHUB_WORKSPACE/OpenDDS_Build_3.15.zip
29+
python $GITHUB_WORKSPACE/third_party/CommonTools/scripts/utilsftp.py -c check -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Build_3.16.zip -l $GITHUB_WORKSPACE/OpenDDS_Build_3.16.zip
3030
3131
- name: If failed we need to rebuild artifact
3232
id: check_existsOpenDDS
@@ -123,21 +123,21 @@ jobs:
123123
124124
- name: Prepare for packaging OpenDDS Binaries and PDB
125125
run: |
126-
Compress-Archive -Path .\Output\* -DestinationPath .\OpenDDS_Build_3.15.zip
127-
Compress-Archive -Path .\OutputPdb\* -DestinationPath .\OpenDDS_PDB_Build_3.15.zip
126+
Compress-Archive -Path .\Output\* -DestinationPath .\OpenDDS_Build_3.16.zip
127+
Compress-Archive -Path .\OutputPdb\* -DestinationPath .\OpenDDS_PDB_Build_3.16.zip
128128
129129
- name: Prepare for packaging OpenDDS Headers
130130
shell: cmd
131131
run: |
132-
7z a .\OpenDDS_Headers_3.15.zip .\third_party\OpenDDS\*.h -r
133-
7z u .\OpenDDS_Headers_3.15.zip .\third_party\OpenDDS\*.inl -r
132+
7z a .\OpenDDS_Headers_3.16.zip .\third_party\OpenDDS\*.h -r
133+
7z u .\OpenDDS_Headers_3.16.zip .\third_party\OpenDDS\*.inl -r
134134
135135
- name: Upload OpenDDS
136136
shell: cmd
137137
run: |
138-
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Build_3.15.zip -l %GITHUB_WORKSPACE%\OpenDDS_Build_3.15.zip
139-
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_PDB_Build_3.15.zip -l %GITHUB_WORKSPACE%\OpenDDS_PDB_Build_3.15.zip
140-
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Headers_3.15.zip -l %GITHUB_WORKSPACE%\OpenDDS_Headers_3.15.zip
138+
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Build_3.16.zip -l %GITHUB_WORKSPACE%\OpenDDS_Build_3.16.zip
139+
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_PDB_Build_3.16.zip -l %GITHUB_WORKSPACE%\OpenDDS_PDB_Build_3.16.zip
140+
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Headers_3.16.zip -l %GITHUB_WORKSPACE%\OpenDDS_Headers_3.16.zip
141141
env:
142142
GITHUB_WORKSPACE: $GITHUB_WORKSPACE
143143

@@ -233,24 +233,24 @@ jobs:
233233
- name: Download OpenDDS Binaries
234234
shell: cmd
235235
run: |
236-
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c download -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Build_3.15.zip -l %GITHUB_WORKSPACE%\OpenDDS_Build_3.15.zip
236+
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c download -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Build_3.16.zip -l %GITHUB_WORKSPACE%\OpenDDS_Build_3.16.zip
237237
env:
238238
GITHUB_WORKSPACE: $GITHUB_WORKSPACE
239239

240240
- name: Download OpenDDS Headers
241241
shell: cmd
242242
run: |
243-
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c download -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Headers_3.15.zip -l %GITHUB_WORKSPACE%\OpenDDS_Headers_3.15.zip
243+
python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c download -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Headers_3.16.zip -l %GITHUB_WORKSPACE%\OpenDDS_Headers_3.16.zip
244244
env:
245245
GITHUB_WORKSPACE: $GITHUB_WORKSPACE
246246

247247
- name: Prepare OpenDDS Binaries
248248
run: |
249-
Expand-Archive -LiteralPath '.\OpenDDS_Build_3.15.zip' -DestinationPath .\Output -Force
249+
Expand-Archive -LiteralPath '.\OpenDDS_Build_3.16.zip' -DestinationPath .\Output -Force
250250
251251
- name: Prepare OpenDDS Headers
252252
run: |
253-
Expand-Archive -LiteralPath '.\OpenDDS_Headers_3.15.zip' -DestinationPath .\third_party\OpenDDS -Force
253+
Expand-Archive -LiteralPath '.\OpenDDS_Headers_3.16.zip' -DestinationPath .\third_party\OpenDDS -Force
254254
255255
- name: Move OpenDDS x64
256256
shell: cmd
@@ -309,8 +309,9 @@ jobs:
309309
New-Item -Path .\OutputPackage\pdb\x64 -ItemType directory
310310
New-Item -Path .\OutputPackage\include -ItemType directory
311311
New-Item -Path .\OutputPackage\licenses -ItemType directory
312-
Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h
313312
Copy-Item .\src\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h
313+
Copy-Item .\src\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h
314+
Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h
314315
Copy-Item .\src\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h
315316
Copy-Item .\Output\x86\DataDistributionManager.lib .\OutputPackage\lib\x86\DataDistributionManager.lib -Force
316317
Copy-Item .\Output\x64\DataDistributionManager.lib .\OutputPackage\lib\x64\DataDistributionManager.lib -Force

‎.github/workflows/pullrequest.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,9 @@ jobs:
162162
New-Item -Path .\OutputPackage\pdb\x64 -ItemType directory
163163
New-Item -Path .\OutputPackage\include -ItemType directory
164164
New-Item -Path .\OutputPackage\licenses -ItemType directory
165-
Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h
166165
Copy-Item .\src\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h
166+
Copy-Item .\src\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h
167+
Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h
167168
Copy-Item .\src\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h
168169
Copy-Item .\Output\x86\DataDistributionManager.lib .\OutputPackage\lib\x86\DataDistributionManager.lib -Force
169170
Copy-Item .\Output\x64\DataDistributionManager.lib .\OutputPackage\lib\x64\DataDistributionManager.lib -Force

‎.github/workflows/release.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,9 @@ jobs:
164164
New-Item -Path .\OutputPackage\pdb\x64 -ItemType directory
165165
New-Item -Path .\OutputPackage\include -ItemType directory
166166
New-Item -Path .\OutputPackage\licenses -ItemType directory
167-
Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h
168167
Copy-Item .\src\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h
168+
Copy-Item .\src\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h
169+
Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h
169170
Copy-Item .\src\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h
170171
Copy-Item .\Output\x86\DataDistributionManager.lib .\OutputPackage\lib\x86\DataDistributionManager.lib -Force
171172
Copy-Item .\Output\x64\DataDistributionManager.lib .\OutputPackage\lib\x64\DataDistributionManager.lib -Force

‎docs/api/MASES.DataDistributionManager.Bindings.BaseConfiguration.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta name="viewport" content="width=device-width">
1111
<meta name="title" content="Class BaseConfiguration
1212
| Data Distribution Manager website ">
13-
<meta name="generator" content="docfx 2.56.6.0">
13+
<meta name="generator" content="docfx 2.56.7.0">
1414

1515
<link rel="shortcut icon" href="../favicon.ico">
1616
<link rel="stylesheet" href="../styles/docfx.vendor.css">
@@ -153,10 +153,10 @@ <h3 id="properties">Properties
153153
</h3>
154154
<span class="small pull-right mobile-hide">
155155
<span class="divider">|</span>
156-
<a href="https://github.com/masesgroup/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration_Configuration.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration.Configuration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
156+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration_Configuration.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration.Configuration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
157157
</span>
158158
<span class="small pull-right mobile-hide">
159-
<a href="https://github.com/masesgroup/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L50">View Source</a>
159+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L50">View Source</a>
160160
</span>
161161
<a id="MASES_DataDistributionManager_Bindings_BaseConfiguration_Configuration_" data-uid="MASES.DataDistributionManager.Bindings.BaseConfiguration.Configuration*"></a>
162162
<h4 id="MASES_DataDistributionManager_Bindings_BaseConfiguration_Configuration" data-uid="MASES.DataDistributionManager.Bindings.BaseConfiguration.Configuration">Configuration</h4>
@@ -187,10 +187,10 @@ <h3 id="methods">Methods
187187
</h3>
188188
<span class="small pull-right mobile-hide">
189189
<span class="divider">|</span>
190-
<a href="https://github.com/masesgroup/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration_CheckConfiguration.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration.CheckConfiguration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
190+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration_CheckConfiguration.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration.CheckConfiguration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
191191
</span>
192192
<span class="small pull-right mobile-hide">
193-
<a href="https://github.com/masesgroup/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L44">View Source</a>
193+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L44">View Source</a>
194194
</span>
195195
<a id="MASES_DataDistributionManager_Bindings_BaseConfiguration_CheckConfiguration_" data-uid="MASES.DataDistributionManager.Bindings.BaseConfiguration.CheckConfiguration*"></a>
196196
<h4 id="MASES_DataDistributionManager_Bindings_BaseConfiguration_CheckConfiguration" data-uid="MASES.DataDistributionManager.Bindings.BaseConfiguration.CheckConfiguration">CheckConfiguration()</h4>
@@ -203,10 +203,10 @@ <h5 class="decalaration">Declaration</h5>
203203
</div>
204204
<span class="small pull-right mobile-hide">
205205
<span class="divider">|</span>
206-
<a href="https://github.com/masesgroup/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration_EmitPropertyChanged_System_String_.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration.EmitPropertyChanged(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
206+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration_EmitPropertyChanged_System_String_.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration.EmitPropertyChanged(System.String)%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
207207
</span>
208208
<span class="small pull-right mobile-hide">
209-
<a href="https://github.com/masesgroup/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L36">View Source</a>
209+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L36">View Source</a>
210210
</span>
211211
<a id="MASES_DataDistributionManager_Bindings_BaseConfiguration_EmitPropertyChanged_" data-uid="MASES.DataDistributionManager.Bindings.BaseConfiguration.EmitPropertyChanged*"></a>
212212
<h4 id="MASES_DataDistributionManager_Bindings_BaseConfiguration_EmitPropertyChanged_System_String_" data-uid="MASES.DataDistributionManager.Bindings.BaseConfiguration.EmitPropertyChanged(System.String)">EmitPropertyChanged(String)</h4>
@@ -239,10 +239,10 @@ <h3 id="events">Events
239239
</h3>
240240
<span class="small pull-right mobile-hide">
241241
<span class="divider">|</span>
242-
<a href="https://github.com/masesgroup/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration_PropertyChanged.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration.PropertyChanged%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
242+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration_PropertyChanged.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration.PropertyChanged%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">Improve this Doc</a>
243243
</span>
244244
<span class="small pull-right mobile-hide">
245-
<a href="https://github.com/masesgroup/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L31">View Source</a>
245+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L31">View Source</a>
246246
</span>
247247
<h4 id="MASES_DataDistributionManager_Bindings_BaseConfiguration_PropertyChanged" data-uid="MASES.DataDistributionManager.Bindings.BaseConfiguration.PropertyChanged">PropertyChanged</h4>
248248
<div class="markdown level1 summary"></div>
@@ -281,10 +281,10 @@ <h3 id="implements">Implements</h3>
281281
<div class="contribution">
282282
<ul class="nav">
283283
<li>
284-
<a href="https://github.com/masesgroup/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
284+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/new/master/apiSpec/new?filename=MASES_DataDistributionManager_Bindings_BaseConfiguration.md&amp;value=---%0Auid%3A%20MASES.DataDistributionManager.Bindings.BaseConfiguration%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A" class="contribution-link">Improve this Doc</a>
285285
</li>
286286
<li>
287-
<a href="https://github.com/masesgroup/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L27" class="contribution-link">View Source</a>
287+
<a href="https://github.com/mariomastrodicasa/DataDistributionManager/blob/master/src/DataDistributionManagerNet/BaseConfiguration.cs/#L27" class="contribution-link">View Source</a>
288288
</li>
289289
</ul>
290290
</div>

0 commit comments

Comments
 (0)