Skip to content

Commit

Permalink
Committing clang-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@github-actions
github-actions[bot] committed Nov 2, 2023
1 parent 8b1e7ce commit da31d0b
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/server/include/pdc_client_server_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ typedef struct pdc_metadata_t {
uint8_t region_partition;
uint8_t consistency;

char tags[TAG_LEN_MAX]; // old, use kvtag
char tags[TAG_LEN_MAX]; // old, use kvtag
pdc_kvtag_list_t *kvtag_list_head;
char data_location[ADDR_MAX];

Expand Down
67 changes: 33 additions & 34 deletions src/server/pdc_server.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,9 +701,9 @@ PDC_Server_get_subdir_count(char *path)
while ((entry = readdir(dir)) != NULL) {
char *name = entry->d_name;
/* if (entry->d_type == DT_DIR) { */
if (!strcmp(name, ".") || !strcmp(name, "..") || strstr(name, "cfg"))
continue;
count++;
if (!strcmp(name, ".") || !strcmp(name, "..") || strstr(name, "cfg"))
continue;
count++;
/* } */
}
closedir(dir);
Expand Down Expand Up @@ -765,11 +765,11 @@ region_cmp(region_list_t *a, region_list_t *b)
static perr_t
PDC_Server_restart_flex(char *chk_dir)
{
perr_t ret_value = SUCCEED;
int n_file, n_entry, count, i, j, nobj = 0, all_nobj = 0, all_n_region, n_region, n_objs;
int n_kvtag, key_len, n_cont, myi, server_id, is_mine, fid, ret, total_region = 0;
pdc_metadata_t * metadata, *elt;
region_list_t * region_list;
perr_t ret_value = SUCCEED;
int n_file, n_entry, count, i, j, nobj = 0, all_nobj = 0, all_n_region, n_region, n_objs;
int n_kvtag, key_len, n_cont, myi, server_id, is_mine, fid, ret, total_region = 0;
pdc_metadata_t *metadata, *elt;
region_list_t * region_list;
pdc_hash_table_entry_head * obj_entry;
pdc_cont_hash_table_entry_t *cont_entry;
uint32_t hash_key;
Expand Down Expand Up @@ -835,7 +835,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* printf("Read failed for n_count\n"); */
/* } */

n_cont = *(int*)buf;
n_cont = *(int *)buf;
buf += sizeof(int);

for (j = 0; j < n_cont; j++) {
Expand All @@ -844,7 +844,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(hash_key, sizeof(uint32_t), 1, file) != 1) { */
/* printf("Read failed for hash_key\n"); */
/* } */
hash_key = *(uint32_t*)buf;
hash_key = *(uint32_t *)buf;
buf += sizeof(uint32_t);

server_id = hash_key % pdc_server_size_g;
Expand All @@ -863,7 +863,7 @@ PDC_Server_restart_flex(char *chk_dir)

// Read cont kvtags
/* if (fread(&n_kvtag, sizeof(int), 1, file) != 1) { */
n_kvtag = *(int*)buf;
n_kvtag = *(int *)buf;
buf += sizeof(int);

for (j = 0; j < n_kvtag; j++) {
Expand All @@ -875,7 +875,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&key_len, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for key_len\n"); */
/* } */
key_len = *(int*)buf;
key_len = *(int *)buf;
buf += sizeof(int);

/* if (fread((void *)(kvtag_list->kvtag->name), key_len, 1, file) != 1) { */
Expand All @@ -890,15 +890,15 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&kvtag_list->kvtag->size, sizeof(uint32_t), 1, file) != 1) { */
/* printf("Read failed for kvtag_list->kvtag->size\n"); */
/* } */
uint32_t value_size = *(uint32_t*)buf;
uint32_t value_size = *(uint32_t *)buf;
buf += sizeof(uint32_t);
if (is_mine)
kvtag_list->kvtag->size = value_size;

/* if (fread(&kvtag_list->kvtag->type, sizeof(int8_t), 1, file) != 1) { */
/* printf("Read failed for kvtag_list->kvtag->type\n"); */
/* } */
int8_t type = *(int8_t*)buf;
int8_t type = *(int8_t *)buf;
buf += sizeof(int8_t);
if (is_mine)
kvtag_list->kvtag->type = type;
Expand Down Expand Up @@ -931,21 +931,21 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&n_entry, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for n_entry\n"); */
/* } */
n_entry = *(int*)buf;
n_entry = *(int *)buf;
buf += sizeof(int);

while (n_entry > 0) {
is_mine = 0;
/* if (fread(&count, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for count\n"); */
/* } */
count = *(int*)buf;
count = *(int *)buf;
buf += sizeof(int);

/* if (fread(hash_key, sizeof(uint32_t), 1, file) != 1) { */
/* printf("Read failed for hash_key\n"); */
/* } */
hash_key = *(uint32_t*)buf;
hash_key = *(uint32_t *)buf;
buf += sizeof(uint32_t);

server_id = hash_key % pdc_server_size_g;
Expand Down Expand Up @@ -984,7 +984,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&n_kvtag, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for n_kvtag\n"); */
/* } */
n_kvtag = *(int*)buf;
n_kvtag = *(int *)buf;
buf += sizeof(int);

for (j = 0; j < n_kvtag; j++) {
Expand All @@ -996,7 +996,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&key_len, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for key_len\n"); */
/* } */
key_len = *(int*)buf;
key_len = *(int *)buf;
buf += sizeof(int);

/* if (fread((void *)(kvtag_list->kvtag->name), key_len, 1, file) != 1) { */
Expand All @@ -1011,7 +1011,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&kvtag_list->kvtag->size, sizeof(uint32_t), 1, file) != 1) { */
/* printf("Read failed for kvtag_list->kvtag->size\n"); */
/* } */
uint32_t value_size = *(uint32_t*)buf;
uint32_t value_size = *(uint32_t *)buf;
if (is_mine)
kvtag_list->kvtag->size = value_size;

Expand All @@ -1020,7 +1020,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&kvtag_list->kvtag->type, sizeof(int8_t), 1, file) != 1) { */
/* printf("Read failed for kvtag_list->kvtag->type\n"); */
/* } */
int8_t type = *(int8_t*)buf;
int8_t type = *(int8_t *)buf;
buf += sizeof(int8_t);
if (is_mine)
kvtag_list->kvtag->type = (int8_t)type;
Expand All @@ -1042,12 +1042,11 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&n_region, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for n_region\n"); */
/* } */
n_region = *(int*)buf;
n_region = *(int *)buf;
buf += sizeof(int);

if (n_region < 0) {
printf("==PDC_SERVER[%d]: %s - region number ERROR!",
pdc_server_rank_g, __func__);
printf("==PDC_SERVER[%d]: %s - region number ERROR!", pdc_server_rank_g, __func__);
ret_value = FAIL;
goto done;
}
Expand All @@ -1068,7 +1067,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&has_hist, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for has_list\n"); */
/* } */
has_hist = *(int*)buf;
has_hist = *(int *)buf;
buf += sizeof(int);

if (has_hist == 1) {
Expand All @@ -1080,7 +1079,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&region_list->region_hist->dtype, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for region_list->region_hist->dtype\n"); */
/* } */
dtype = *(int*)buf;
dtype = *(int *)buf;
buf += sizeof(int);

if (is_mine)
Expand All @@ -1089,14 +1088,14 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&region_list->region_hist->nbin, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for region_list->region_hist->nbin\n"); */
/* } */
nbin = *(int*)buf;
nbin = *(int *)buf;
buf += sizeof(int);

if (is_mine) {
region_list->region_hist->nbin = nbin;
if (region_list->region_hist->nbin == 0) {
printf("==PDC_SERVER[%d]: %s - histogram size is 0!",
pdc_server_rank_g, __func__);
printf("==PDC_SERVER[%d]: %s - histogram size is 0!", pdc_server_rank_g,
__func__);
}
}

Expand All @@ -1123,7 +1122,7 @@ PDC_Server_restart_flex(char *chk_dir)
*/
/* printf("Read failed for region_list->region_hist->incr\n"); */
/* } */
region_list->region_hist->incr = *(double*)buf;
region_list->region_hist->incr = *(double *)buf;
buf += sizeof(double);
}
else {
Expand Down Expand Up @@ -1204,7 +1203,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&n_objs, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for n_objs\n"); */
/* } */
n_objs = *(int*)buf;
n_objs = *(int *)buf;
buf += sizeof(int);

// NOTE: Currently only supports restart data regions with same or more number of servers
Expand All @@ -1218,13 +1217,13 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&new_obj_reg->obj_id, sizeof(uint64_t), 1, file) != 1) { */
/* printf("Read failed for obj_id\n"); */
/* } */
new_obj_reg->obj_id = *(uint64_t*)buf;
new_obj_reg->obj_id = *(uint64_t *)buf;
buf += sizeof(uint64_t);

/* if (fread(&n_region, sizeof(int), 1, file) != 1) { */
/* printf("Read failed for n_region\n"); */
/* } */
n_region = *(int*)buf;
n_region = *(int *)buf;
buf += sizeof(int);

DL_APPEND(dataserver_region_g, new_obj_reg);
Expand All @@ -1242,7 +1241,7 @@ PDC_Server_restart_flex(char *chk_dir)
/* if (fread(&checkpoint_size, sizeof(uint64_t), 1, file) != 1) { */
/* printf("Read failed for checkpoint size\n"); */
/* } */
checkpoint_size = *(uint64_t*)buf;
checkpoint_size = *(uint64_t *)buf;
buf += sizeof(uint64_t);

/* printf("checkpoint size for metadata query = %lu\n", checkpoint_size); */
Expand Down
3 changes: 1 addition & 2 deletions src/server/pdc_server_region/pdc_server_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ PDC_Server_set_lustre_stripe(const char *path, int stripe_count, int stripe_size
break;
}
}
snprintf(cmd, 1024, "lfs setstripe -S %dM -c %d -i %d %s", stripe_size_MB, stripe_count, index,
tmp);
snprintf(cmd, 1024, "lfs setstripe -S %dM -c %d -i %d %s", stripe_size_MB, stripe_count, index, tmp);

if (system(cmd) < 0) {
printf("==PDC_SERVER: Fail to set Lustre stripe parameters [%s]\n", tmp);
Expand Down
4 changes: 2 additions & 2 deletions src/tests/kvtag_add_get_scale.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ main(int argc, char *argv[])
assign_work_to_rank(my_rank, proc_num, n_query, &my_query, &my_query_s);
assign_work_to_rank(my_rank, proc_num, n_obj, &my_obj, &my_obj_s);

obj_1percent = my_obj / 100;
obj_1percent = my_obj / 100;
if (obj_1percent == 0)
obj_1percent = 1;
tag_1percent = my_add_tag / 100;
tag_1percent = my_add_tag / 100;
if (tag_1percent == 0)
tag_1percent = 1;
query_1percent = my_query / 100;
Expand Down

0 comments on commit da31d0b

Please sign in to comment.