Skip to content

Commit

Permalink
removed whitespace through formatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hariharan-devarajan
hariharan-devarajan committed Jan 13, 2021
1 parent e2170dd commit 08e9759
Showing 1 changed file with 32 additions and 25 deletions.
57 changes: 32 additions & 25 deletions src/metadata_management.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

#include <string>

#include "memory_management.h"
#include "buffer_pool.h"
#include "buffer_pool_internal.h"
#include "memory_management.h"
#include "metadata_storage.h"
#include "rpc.h"
#include "metadata_storage.h"

namespace hermes {

Expand Down Expand Up @@ -104,7 +104,7 @@ void LocalDelete(MetadataManager *mdm, const char *key, MapType map_type) {

MetadataManager *GetMetadataManagerFromContext(SharedMemoryContext *context) {
MetadataManager *result =
(MetadataManager *)(context->shm_base + context->metadata_manager_offset);
(MetadataManager *)(context->shm_base + context->metadata_manager_offset);

return result;
}
Expand Down Expand Up @@ -227,14 +227,14 @@ void PutBlobId(MetadataManager *mdm, RpcContext *rpc, const std::string &name,

VBucketInfo *GetVBucketInfoByIndex(MetadataManager *mdm, u32 index) {
VBucketInfo *info_array =
(VBucketInfo *)((u8 *)mdm + mdm->vbucket_info_offset);
(VBucketInfo *)((u8 *)mdm + mdm->vbucket_info_offset);
VBucketInfo *result = info_array + index;

return result;
}

BucketID LocalGetNextFreeBucketId(SharedMemoryContext *context, RpcContext *rpc,
const std::string &name) {
const std::string &name) {
MetadataManager *mdm = GetMetadataManagerFromContext(context);
BucketID result = {};

Expand Down Expand Up @@ -275,8 +275,8 @@ BucketID GetNextFreeBucketId(SharedMemoryContext *context, RpcContext *rpc,
if (target_node == rpc->node_id) {
result = LocalGetNextFreeBucketId(context, rpc, name);
} else {
result =
RpcCall<BucketID>(rpc, target_node, "RemoteGetNextFreeBucketId", name);
result = RpcCall<BucketID>(rpc, target_node, "RemoteGetNextFreeBucketId",
name);
}

return result;
Expand Down Expand Up @@ -306,6 +306,8 @@ VBucketID GetNextFreeVBucketId(SharedMemoryContext *context, RpcContext *rpc,
MetadataManager *mdm = GetMetadataManagerFromContext(context);
VBucketID result = {};

// TODO(chogan): Could replace this with lock-free version if/when it matters

if (mdm->num_vbuckets < mdm->max_vbuckets) {
result = mdm->first_free_vbucket;
if (!IsNullVBucketId(result)) {
Expand All @@ -324,7 +326,6 @@ VBucketID GetNextFreeVBucketId(SharedMemoryContext *context, RpcContext *rpc,
<< "Increase max_vbuckets_per_node in the Hermes configuration."
<< std::endl;
}

if (!IsNullVBucketId(result)) {
PutVBucketId(mdm, rpc, name, result);
}
Expand Down Expand Up @@ -418,8 +419,9 @@ void GetBufferIdList(Arena *arena, SharedMemoryContext *context,
if (target_node == rpc->node_id) {
LocalGetBufferIdList(arena, mdm, blob_id, buffer_ids);
} else {
std::vector<BufferID> result = RpcCall<std::vector<BufferID>>(
rpc, target_node, "RemoteGetBufferIdList", blob_id);
std::vector<BufferID> result =
RpcCall<std::vector<BufferID>>(rpc, target_node, "RemoteGetBufferIdList",
blob_id);
buffer_ids->ids = PushArray<BufferID>(arena, result.size());
buffer_ids->length = (u32)result.size();
CopyIds((u64 *)buffer_ids->ids, (u64 *)result.data(), result.size());
Expand All @@ -443,7 +445,8 @@ std::vector<BufferID> GetBufferIdList(SharedMemoryContext *context,
return result;
}

BufferIdArray GetBufferIdsFromBlobId(Arena *arena, SharedMemoryContext *context,
BufferIdArray GetBufferIdsFromBlobId(Arena *arena,
SharedMemoryContext *context,
RpcContext *rpc, BlobID blob_id,
u32 **sizes) {
BufferIdArray result = {};
Expand All @@ -462,11 +465,12 @@ BufferIdArray GetBufferIdsFromBlobId(Arena *arena, SharedMemoryContext *context,

BufferIdArray GetBufferIdsFromBlobName(Arena *arena,
SharedMemoryContext *context,
RpcContext *rpc, const char *blob_name,
RpcContext *rpc,
const char *blob_name,
u32 **sizes) {
BlobID blob_id = GetBlobIdByName(context, rpc, blob_name);
BufferIdArray result =
GetBufferIdsFromBlobId(arena, context, rpc, blob_id, sizes);
BufferIdArray result = GetBufferIdsFromBlobId(arena, context, rpc, blob_id,
sizes);

return result;
}
Expand All @@ -481,8 +485,9 @@ void AttachBlobToBucket(SharedMemoryContext *context, RpcContext *rpc,
BlobID blob_id = {};
// NOTE(chogan): A negative node_id indicates a swap blob
blob_id.bits.node_id = is_swap_blob ? -target_node : target_node;
blob_id.bits.buffer_ids_offset =
AllocateBufferIdList(context, rpc, target_node, buffer_ids);
blob_id.bits.buffer_ids_offset = AllocateBufferIdList(context, rpc,
target_node,
buffer_ids);
PutBlobId(mdm, rpc, blob_name, blob_id);
AddBlobIdToBucket(mdm, rpc, blob_id, bucket_id);
}
Expand Down Expand Up @@ -688,7 +693,7 @@ u64 GetRemainingCapacity(SharedMemoryContext *context, RpcContext *rpc,

SystemViewState *GetLocalSystemViewState(MetadataManager *mdm) {
SystemViewState *result =
(SystemViewState *)((u8 *)mdm + mdm->system_view_state_offset);
(SystemViewState *)((u8 *)mdm + mdm->system_view_state_offset);

return result;
}
Expand All @@ -712,7 +717,7 @@ std::vector<u64> LocalGetGlobalDeviceCapacities(SharedMemoryContext *context) {
}

std::vector<u64> GetGlobalDeviceCapacities(SharedMemoryContext *context,
RpcContext *rpc) {
RpcContext *rpc) {
MetadataManager *mdm = GetMetadataManagerFromContext(context);
u32 target_node = mdm->global_system_view_state_node_id;

Expand All @@ -731,7 +736,7 @@ std::vector<u64> GetGlobalDeviceCapacities(SharedMemoryContext *context,
SystemViewState *GetGlobalSystemViewState(SharedMemoryContext *context) {
MetadataManager *mdm = GetMetadataManagerFromContext(context);
SystemViewState *result =
(SystemViewState *)((u8 *)mdm + mdm->global_system_view_state_offset);
(SystemViewState *)((u8 *)mdm + mdm->global_system_view_state_offset);
assert((u8 *)result != (u8 *)mdm);

return result;
Expand Down Expand Up @@ -778,7 +783,9 @@ TargetID FindTargetIdFromDeviceId(const std::vector<TargetID> &targets,
DeviceID device_id) {
TargetID result = {};
// TODO(chogan): @optimization Inefficient O(n)
for (size_t target_index = 0; target_index < targets.size(); ++target_index) {
for (size_t target_index = 0;
target_index < targets.size();
++target_index) {
if (targets[target_index].bits.device_id == device_id) {
result = targets[target_index];
break;
Expand Down Expand Up @@ -870,7 +877,7 @@ void InitMetadataManager(MetadataManager *mdm, Arena *arena, Config *config,
SeedHashForStorage(mdm->map_seed);

mdm->system_view_state_update_interval_ms =
config->system_view_state_update_interval_ms;
config->system_view_state_update_interval_ms;

// Initialize SystemViewState

Expand All @@ -888,8 +895,8 @@ void InitMetadataManager(MetadataManager *mdm, Arena *arena, Config *config,

// Initialize BucketInfo array

BucketInfo *buckets =
PushArray<BucketInfo>(arena, config->max_buckets_per_node);
BucketInfo *buckets = PushArray<BucketInfo>(arena,
config->max_buckets_per_node);
mdm->bucket_info_offset = GetOffsetFromMdm(mdm, buckets);
mdm->first_free_bucket.bits.node_id = (u32)node_id;
mdm->first_free_bucket.bits.index = 0;
Expand All @@ -910,8 +917,8 @@ void InitMetadataManager(MetadataManager *mdm, Arena *arena, Config *config,

// Initialize VBucketInfo array

VBucketInfo *vbuckets =
PushArray<VBucketInfo>(arena, config->max_vbuckets_per_node);
VBucketInfo *vbuckets = PushArray<VBucketInfo>(arena,
config->max_vbuckets_per_node);
mdm->vbucket_info_offset = GetOffsetFromMdm(mdm, vbuckets);
mdm->first_free_vbucket.bits.node_id = (u32)node_id;
mdm->first_free_vbucket.bits.index = 0;
Expand Down

0 comments on commit 08e9759

Please sign in to comment.