Skip to content

Commit

Permalink
Merge pull request #236 from raakella1/merge_stable
Browse files Browse the repository at this point in the history 
Merge stable 8.x into master
  • Loading branch information
@szmyd
szmyd authored May 29, 2024
2 parents 3ed9693 + dd253e3 commit 4e31b26
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/actions/load_conan/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ runs:
- name: Restore Cache
id: restore-cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: |
~/.conan/data
key: ${{ inputs.key_prefix }}-${{ hashFiles(steps.hash-key-primary.outputs.key, steps.hash-key-3rd.outputs.keys) }}
fail-on-cache-miss: ${{ inputs.fail_on_cache_miss }}

- name: Restore Testing Cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: |
~/.conan/data
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/store_conan/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ runs:
rm -rf ~/.conan/data/*/*/*/*/source
- name: Save Cache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: |
~/.conan/data
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class SISLConan(ConanFile):
name = "sisl"
version = "12.2.2"
version = "12.2.3"

homepage = "https://github.com/eBay/sisl"
description = "Library for fast data structures, utilities"
Expand Down
25 changes: 8 additions & 17 deletions include/sisl/metrics/histogram_buckets.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,17 @@ typedef std::vector< double > hist_bucket_boundaries_t;

/* For any new histogram buckets, define a name and its values here */
#define HIST_BKTS_TYPES \
X(DefaultBuckets, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 120, 140, 160, 180, 200, 220, 240, 260, 280, 300, 320, \
340, 360, 380, 400, 425, 450, 475, 500, 550, 600, 650, 700, 750, 800, 850, 900, 950, 1000, 1100, 1200, 1300, \
1400, 1500, 1600, 1700, 1800, 1900, 2000, 2500, 3000, 3500, 4000, 4500, 5000, 5500, 6000, 6500, 7000, 7500, \
8000, 8500, 9000, 9500, 10000, 11000, 12000, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000, 21000, \
30000, 40000, 50000, 60000, 70000, 80000, 90000, 100000, 110000, 130000, 150000, 180000, 210000, 240000, 300000, \
360000, 450000, 540000, 800000, 1200000, 1800000, 2700000, 4000000) \
X(DefaultBuckets, 10, 40, 70, 100, 160, 220, 280, 340, 400, 475, 600, 750, 900, 1100, 1400, 1700, 2000, 3500, \
5000, 6500, 8000, 10000, 13000, 16000, 20000, 50000, 80000, 100000, 150000, 180000, 200000, 500000, 2000000, \
3000000, 4000000) \
\
X(ExponentialOfTwoBuckets, 1, exp2(1), exp2(2), exp2(3), exp2(4), exp2(5), exp2(6), exp2(7), exp2(8), exp2(9), \
exp2(10), exp2(11), exp2(12), exp2(13), exp2(14), exp2(15), exp2(16), exp2(17), exp2(18), exp2(19), exp2(20), \
exp2(21), exp2(22), exp2(23), exp2(24), exp2(25), exp2(26), exp2(27), exp2(28), exp2(29), exp2(30), exp2(31)) \
X(ExponentialOfTwoBuckets, 1, exp2(4), exp2(7), exp2(10), exp2(13), exp2(16), exp2(19), exp2(22), exp2(25), \
exp2(28), exp2(31)) \
\
X(LinearUpto64Buckets, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, \
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, \
53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64) \
X(LinearUpto64Buckets, 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 64) \
\
X(LinearUpto128Buckets, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, \
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, \
53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, \
81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, \
107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128) \
X(LinearUpto128Buckets, 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 64, 68, 72, 76, 80, 84, 88, \
92, 96, 100, 104, 108, 112, 116, 120, 124, 128) \
\
X(SingleValueBucket, std::numeric_limits< double >::max())

Expand Down
6 changes: 3 additions & 3 deletions src/metrics/tests/wrapper_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ nlohmann::json expected = {
{"Histograms percentiles (usecs) avg/50/95/99", {
{"Cache Delete Latency", "200.0 / 0.0 / 0.0 / 0.0" },
{"Cache Read Latency", "150.0 / 0.0 / 0.0 / 0.0" },
{"Cache Write Latency", "125.0 / 99.0 / 99.0 / 99.0"}
{"Cache Write Latency", "125.0 / 73.0 / 73.0 / 73.0"}
}}
}},
{"cache1_2", {
Expand All @@ -181,7 +181,7 @@ nlohmann::json expected = {
{"Total cache size", 20}
}},
{"Histograms percentiles (usecs) avg/50/95/99", {
{"Cache Delete Latency", "275.0 / 152.0 / 152.0 / 152.0" },
{"Cache Delete Latency", "275.0 / 104.0 / 104.0 / 104.0" },
{"Cache Read Latency", "350.0 / 0.0 / 0.0 / 0.0" },
{"Cache Write Latency", "200.0 / 0.0 / 0.0 / 0.0"}
}}
Expand Down Expand Up @@ -218,7 +218,7 @@ nlohmann::json expected = {
{"Total memory utilization", 980}
}},
{"Histograms percentiles (usecs) avg/50/95/99", {
{"Distribution of request per transactions", "18.2 / 15.0 / 31.0 / 31.0"}
{"Distribution of request per transactions", "18.2 / 6.0 / 16.0 / 16.0"}
}}
}}
}}
Expand Down

0 comments on commit 4e31b26

Please sign in to comment.