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/actions/setup_conan2/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
platform:
description: 'Platform conan will be building on'
required: true
default: 'ubuntu-22.04'
default: 'ubuntu-24.04'
runs:
using: "composite"
steps:
Expand All @@ -28,5 +28,5 @@ runs:
sed -i 's,compiler.libcxx=libstdc++$,compiler.libcxx=libstdc++11,g' ~/.conan2/profiles/default
# Set C++ version to C++20
sed -i 's,compiler.cppstd=.*$,compiler.cppstd=20,g' ~/.conan2/profiles/default
if: ${{ inputs.platform == 'ubuntu-22.04' }}
if: ${{ inputs.platform == 'ubuntu-24.04' }}

11 changes: 4 additions & 7 deletions .github/workflows/build_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
inputs:
platform:
required: false
default: 'ubuntu-22.04'
default: 'ubuntu-24.04'
type: string
branch:
required: true
Expand All @@ -30,11 +30,8 @@ on:
required: true
type: choice
options:
- ubuntu-22.04
- ubuntu-20.04
- macos-13
- macos-12
default: 'ubuntu-22.04'
- ubuntu-24.04
default: 'ubuntu-24.04'
branch:
required: true
type: string
Expand Down Expand Up @@ -87,7 +84,7 @@ jobs:
if: ${{ inputs.testing == 'False' }}

- name: Setup Conan
uses: ebay/sisl/.github/actions/setup_conan2@dev/v13.x
uses: szmyd/sisl/.github/actions/setup_conan2@dev/v13.x
with:
platform: ${{ inputs.platform }}
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: ["ubuntu-22.04"]
platform: ["ubuntu-24.04"]
build-type: ["Debug", "Release"]
malloc-impl: ["libc", "tcmalloc"]
tooling: ["Sanitize", "Coverage", "None"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: ["ubuntu-22.04"]
platform: ["ubuntu-24.04"]
build-type: ["Debug", "Release"]
malloc-impl: ["libc", "tcmalloc"]
tooling: ["Sanitize", "Coverage", "None"]
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent { label 'sds-builder-v5' }
agent { label 'sds-builder-v8' }

environment {
ARTIFACTORY_PASS = credentials('ARTIFACTORY_PASS')
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class SISLConan(ConanFile):
name = "sisl"
version = "13.0.0"
version = "13.0.1"

homepage = "https://github.com/eBay/sisl"
description = "Library for fast data structures, utilities"
Expand Down
2 changes: 1 addition & 1 deletion include/sisl/auth_manager/token_verifier.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class GrpcTokenVerifier : public TokenVerifier {
explicit GrpcTokenVerifier(std::string const& auth_header_key) : m_auth_header_key(auth_header_key) {}
virtual ~GrpcTokenVerifier() = default;

virtual grpc::Status verify(grpc::ServerContext const* srv_ctx) const = 0;
virtual grpc::Status verify_ctx(grpc::ServerContext const* srv_ctx) const = 0;

protected:
std::string m_auth_header_key;
Expand Down
3 changes: 3 additions & 0 deletions include/sisl/fds/bitset.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ class BitsetImpl {
void destroy(const bool destroy_words = true) {
// destruct the BitWords
if (destroy_words) { std::destroy(get_words(), end_words()); }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
this->~bitset_serialized();
#pragma GCC diagnostic pop
}

bool valid_bit(const uint64_t bit) const { return (bit + m_skip_bits) < m_nbits; }
Expand Down
15 changes: 7 additions & 8 deletions include/sisl/fds/bitword.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,10 @@ class Bitword {
if (nbits == 1) { return (is_bit_set_reset(start, check_for_set)); }

const word_t actual{extract(start, nbits)};
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
const word_t expected{static_cast< word_t >(check_for_set ? consecutive_bitmask[nbits - 1] : 0)};
#pragma GCC diagnostic pop
return (actual == expected);
}

Expand Down Expand Up @@ -544,14 +547,7 @@ class Bitword {

word_t to_integer() const { return m_bits.get(); }

std::string to_string() const {
std::ostringstream oSS{};
const word_t e = m_bits.get();
for (uint8_t bit{0}; bit < bits(); ++bit) {
oSS << (((e & bit_mask[bit]) == bit_mask[bit]) ? '1' : '0');
}
return oSS.str();
}
std::string to_string() const { return fmt::format("{0:0>{1}b}", m_bits.get(), bits()); }

void print() const { std::cout << to_string() << std::endl; }

Expand All @@ -562,8 +558,11 @@ class Bitword {
private:
word_t extract(const uint8_t start, const uint8_t nbits) const {
const uint8_t wanted_bits{std::min< uint8_t >(bits() - start, nbits)};
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
assert(wanted_bits > 0);
const word_t mask{static_cast< word_t >(static_cast< word_t >(consecutive_bitmask[wanted_bits - 1]) << start)};
#pragma GCC diagnostic pop
return ((m_bits.get() & mask) >> start);
}

Expand Down
2 changes: 1 addition & 1 deletion src/cache/tests/test_range_hashmap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
using namespace sisl;
SISL_LOGGING_INIT(test_hashmap)

static uint32_t g_max_offset;
static uint32_t g_max_offset{UINT16_MAX};
static constexpr uint32_t per_val_size = 128;

static thread_local std::random_device g_rd{};
Expand Down
2 changes: 1 addition & 1 deletion src/grpc/rpc_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ void GrpcServer::shutdown() {

bool GrpcServer::is_auth_enabled() const { return m_auth_mgr != nullptr; }

grpc::Status GrpcServer::auth_verify(grpc::ServerContext const* srv_ctx) const { return m_auth_mgr->verify(srv_ctx); }
grpc::Status GrpcServer::auth_verify(grpc::ServerContext const* srv_ctx) const { return m_auth_mgr->verify_ctx(srv_ctx); }

bool GrpcServer::run_generic_handler_cb(const std::string& rpc_name, boost::intrusive_ptr< GenericRpcData >& rpc_data) {
generic_rpc_handler_cb_t cb;
Expand Down
2 changes: 1 addition & 1 deletion src/grpc/tests/unit/auth_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class EchoServiceImpl final {
class MockTokenVerifier : public GrpcTokenVerifier {
public:
using GrpcTokenVerifier::GrpcTokenVerifier;
::grpc::Status verify(::grpc::ServerContext const* srv_ctx) const override {
::grpc::Status verify_ctx(::grpc::ServerContext const* srv_ctx) const override {
auto& client_headers = srv_ctx->client_metadata();
if (auto it = client_headers.find(g_auth_header); it != client_headers.end()) {
if (it->second == g_test_token) { return ::grpc::Status(); }
Expand Down
Loading