Skip to content

Scalar; Move "tag" struct to be inside the "ts" namespace to avoid collisions #7690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SolidWallOfCode merged 1 commit into from
Apr 8, 2021
Merged

Scalar; Move "tag" struct to be inside the "ts" namespace to avoid collisions #7690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions include/tscore/Scalar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
#include <type_traits>
#include "tscore/BufferWriter.h"

namespace ts
{
namespace tag
{
struct generic;
struct generic;
}

namespace ts
{
template <intmax_t N, typename C, typename T> class Scalar;

namespace detail
Expand Down
20 changes: 10 additions & 10 deletions src/traffic_cache_tool/CacheDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
#include "tscore/CryptoHash.h"
#include "tscore/ts_file.h"

namespace tag
namespace ts::tag
{
struct bytes {
static constexpr char const *const label = " bytes";
};
} // namespace tag
} // namespace ts::tag

using ts::round_down;
using ts::round_up;
Expand Down Expand Up @@ -76,19 +76,19 @@ constexpr static int MAX_VOLUME_IDX = 255;
constexpr static int ENTRIES_PER_BUCKET = 4;
constexpr static int MAX_BUCKETS_PER_SEGMENT = (1 << 16) / ENTRIES_PER_BUCKET;

typedef Scalar<1, off_t, tag::bytes> Bytes;
typedef Scalar<1024, off_t, tag::bytes> Kilobytes;
typedef Scalar<1024 * Kilobytes::SCALE, off_t, tag::bytes> Megabytes;
typedef Scalar<1024 * Megabytes::SCALE, off_t, tag::bytes> Gigabytes;
typedef Scalar<1024 * Gigabytes::SCALE, off_t, tag::bytes> Terabytes;
typedef Scalar<1, off_t, ts::tag::bytes> Bytes;
typedef Scalar<1024, off_t, ts::tag::bytes> Kilobytes;
typedef Scalar<1024 * Kilobytes::SCALE, off_t, ts::tag::bytes> Megabytes;
typedef Scalar<1024 * Megabytes::SCALE, off_t, ts::tag::bytes> Gigabytes;
typedef Scalar<1024 * Gigabytes::SCALE, off_t, ts::tag::bytes> Terabytes;

// Units of allocation for stripes.
typedef Scalar<128 * Megabytes::SCALE, int64_t, tag::bytes> CacheStripeBlocks;
typedef Scalar<128 * Megabytes::SCALE, int64_t, ts::tag::bytes> CacheStripeBlocks;
// Size measurement of cache storage.
// Also size of meta data storage units.
typedef Scalar<8 * Kilobytes::SCALE, int64_t, tag::bytes> CacheStoreBlocks;
typedef Scalar<8 * Kilobytes::SCALE, int64_t, ts::tag::bytes> CacheStoreBlocks;
// Size unit for content stored in cache.
typedef Scalar<512, int64_t, tag::bytes> CacheDataBlocks;
typedef Scalar<512, int64_t, ts::tag::bytes> CacheDataBlocks;

/** A cache span is a representation of raw storage.
It corresponds to a raw disk, disk partition, file, or directory.
Expand Down