Skip to content

Commit

Permalink
Merge branch 'main' into add-metadata-validation
Browse files Browse the repository at this point in the history
  • Loading branch information
InsertCreativityHere authored Nov 25, 2024
2 parents ae6c99f + be1ca06 commit fb5e346
Show file tree
Hide file tree
Showing 126 changed files with 946 additions and 3,285 deletions.
10 changes: 9 additions & 1 deletion .github/actions/test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ runs:
working-directory: ${{ inputs.working_directory }}
run: python3 allTests.py --debug --all --continue --workers=4 --export-xml=test-report.xml ${{ inputs.flags }}
shell: bash
if: runner.os == 'macOS' || runner.os == 'Linux'
if: runner.os == 'macOS'

- name: Test
working-directory: ${{ inputs.working_directory }}
run: |
ulimit -c unlimited
python3 allTests.py --debug --all --continue --workers=4 --export-xml=test-report.xml ${{ inputs.flags }}
shell: bash
if: runner.os == 'Linux'

- name: Test
working-directory: ${{ inputs.working_directory }}
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ jobs:
if-no-files-found: ignore
if: always()

- name: Upload Linux core dumps
uses: actions/upload-artifact@v4
with:
name: core-dumps-${{ matrix.config }}-${{ matrix.os }}
path: /var/lib/apport/coredump/*
if-no-files-found: ignore
if: runner.os == 'Linux' && always()

- name: Upload macOS crash diagnostics
uses: actions/upload-artifact@v4
with:
Expand Down
3 changes: 3 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
"upcalls",
"zeroc"
],
"flagWords": [
"wether"
],
"dictionaries": [
"csharp",
"softwareTerms",
Expand Down
17 changes: 13 additions & 4 deletions config/Make.rules.Linux
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,28 @@ else ifneq ($(and $(filter centos rhel fedora,$(linux_id)),$(filter x86_64 i%86,
supported-platforms = x64 x86
multilib-platform = yes

# We filter out -m32, -m64, because Slice compilers are always build as 64bit executables, and we set
# the correct value for each arch build below. We also filter out -march setting to ensure our x86 builds
# target x86-64 capable processor.

ifeq ($(OPTIMIZE),yes)
# Use default system packaging flags if building with OPTIMIZE and CXXFLAGS/LDFLAGS aren't defined.
# NOTE: We remove the -m32/-m64 flags since we'll add them below.
opt-cppflags = $(if $(CXXFLAGS),,$(filter-out -m32 -m64,$(shell setarch $1 rpm --eval %optflags)))
opt-cppflags = $(if $(CXXFLAGS),,$(filter-out -m32 -m64 -march=%,$(shell setarch $1 rpm --eval %optflags)))
opt-ldflags = $(if $(LDFLAGS),,$(shell setarch $1 rpm --eval %?__global_ldflags))
endif

x64_cppflags := $(call opt-cppflags,x86_64) -m64
CXXFLAGS := $(filter-out -m32 -m64 -march=%, $(CXXFLAGS))
LDFLAGS := $(filter-out -m32 -m64, $(LDFLAGS))

# Targeting x86-64-v2, compatible with most x86-64 processors. This matches the defaults in RHEL 9 x86-64 builds.
# https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level

x64_cppflags := $(call opt-cppflags,x86_64) -m64 -march=x86-64-v2
x64_ldflags := $(call opt-ldflags,x86_64) -m64
x64_targetdir = $(if $(filter %/build,$5),/x64,$(if $(filter-out $($1_target),program),64))
x64_installdir = $(if $(and $(filter-out $($1_target),program),$(if $5,$(filter-out %64,$5),true)),64)

x86_cppflags := $(call opt-cppflags,i386) -m32
x86_cppflags := $(call opt-cppflags,i386) -m32 -march=x86-64-v2
x86_ldflags := $(call opt-ldflags,i386) -m32
x86_targetdir = $(if $(filter %/build,$5),/x86)
x86_targetname = $(if $(is-bin-program),32)
Expand Down
5 changes: 5 additions & 0 deletions config/PropertyNames.xml
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,11 @@
<property name="Node.Server" class="ObjectAdapter" languages="cpp" />
<property name="Node.Server.Enabled" default="1" languages="cpp" />
<property name="Node.Server.ForwardDiscoveryToMulticast" default="0" languages="cpp" />
<property name="Topic.ClearHistory" default="OnAll" languages="cpp" />
<property name="Topic.DiscardPolicy" default="Never" languages="cpp" />
<property name="Topic.Priority" default="0" languages="cpp" />
<property name="Topic.SampleCount" default="-1" languages="cpp" />
<property name="Topic.SampleLifetime" default="0" languages="cpp" />
<property name="Trace.Data" default="0" languages="cpp" />
<property name="Trace.Session" default="0" languages="cpp" />
<property name="Trace.Topic" default="0" languages="cpp" />
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/DataStorm/DataStorm.h
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ namespace DataStorm
void waitForUnread(unsigned int count = 1) const;

/**
* Returns wether or not unread samples are available.
* Returns whether or not unread samples are available.
*
* @return True if there unread samples are queued, false otherwise.
*/
Expand Down
Loading

0 comments on commit fb5e346

Please sign in to comment.