Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
- name: CMake
run: cmake . -DBUILD_PERF_TOOLS=ON

# - name: Check formatting
# run: make check-format
- name: Check formatting
run: make check-format

- name: Build
run: make -j8
Expand Down
4 changes: 3 additions & 1 deletion lib/ClientConfiguration.cc
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ ClientConfiguration& ClientConfiguration::setTlsPrivateKeyFilePath(const std::st
return *this;
}

const std::string& ClientConfiguration::getTlsPrivateKeyFilePath() const { return impl_->tlsPrivateKeyFilePath; }
const std::string& ClientConfiguration::getTlsPrivateKeyFilePath() const {
return impl_->tlsPrivateKeyFilePath;
}

ClientConfiguration& ClientConfiguration::setTlsCertificateFilePath(const std::string& filePath) {
impl_->tlsCertificateFilePath = filePath;
Expand Down
10 changes: 5 additions & 5 deletions lib/checksum/crc32c_arm.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
#define crc32c_u16(crc, v) __crc32ch(crc, v)
#define crc32c_u32(crc, v) __crc32cw(crc, v)
#define crc32c_u64(crc, v) __crc32cd(crc, v)
#define PREF4X64L1(buffer, PREF_OFFSET, ITR) \
__asm__("PRFM PLDL1KEEP, [%x[v],%[c]]" ::[v] "r"(buffer), [ c ] "I"((PREF_OFFSET) + ((ITR) + 0) * 64)); \
__asm__("PRFM PLDL1KEEP, [%x[v],%[c]]" ::[v] "r"(buffer), [ c ] "I"((PREF_OFFSET) + ((ITR) + 1) * 64)); \
__asm__("PRFM PLDL1KEEP, [%x[v],%[c]]" ::[v] "r"(buffer), [ c ] "I"((PREF_OFFSET) + ((ITR) + 2) * 64)); \
__asm__("PRFM PLDL1KEEP, [%x[v],%[c]]" ::[v] "r"(buffer), [ c ] "I"((PREF_OFFSET) + ((ITR) + 3) * 64));
#define PREF4X64L1(buffer, PREF_OFFSET, ITR) \
__asm__("PRFM PLDL1KEEP, [%x[v],%[c]]" ::[v] "r"(buffer), [c] "I"((PREF_OFFSET) + ((ITR) + 0) * 64)); \
__asm__("PRFM PLDL1KEEP, [%x[v],%[c]]" ::[v] "r"(buffer), [c] "I"((PREF_OFFSET) + ((ITR) + 1) * 64)); \
__asm__("PRFM PLDL1KEEP, [%x[v],%[c]]" ::[v] "r"(buffer), [c] "I"((PREF_OFFSET) + ((ITR) + 2) * 64)); \
__asm__("PRFM PLDL1KEEP, [%x[v],%[c]]" ::[v] "r"(buffer), [c] "I"((PREF_OFFSET) + ((ITR) + 3) * 64));

#define PREF1KL1(buffer, PREF_OFFSET) \
PREF4X64L1(buffer, (PREF_OFFSET), 0) \
Expand Down
2 changes: 1 addition & 1 deletion tests/AuthPluginTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static const std::string serviceUrlHttps = "https://localhost:8443";

static const std::string caPath = "../test-conf/cacert.pem";
static const std::string clientPublicKeyPath = "../test-conf/client-cert.pem";
static const std::string clientPrivateKeyPath = "../test-conf/client-key.pem";
static const std::string clientPrivateKeyPath = "../test-conf/client-key.pem";

static void sendCallBackTls(Result r, const MessageId& msgId) {
ASSERT_EQ(r, ResultOk);
Expand Down
3 changes: 1 addition & 2 deletions tests/ProtobufNativeSchemaTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ TEST(ProtobufNativeSchemaTest, testSchemaIncompatibility) {
producer.close();

// Try to create producer with another protobuf generated class
ASSERT_EQ(ResultIncompatibleSchema,
createProducerResult(getExternalMessageDescriptor()));
ASSERT_EQ(ResultIncompatibleSchema, createProducerResult(getExternalMessageDescriptor()));

// Try to create producer with the original schema again
ASSERT_EQ(ResultOk, createProducerResult(getTestMessageDescriptor()));
Expand Down