From 8f430b5ea1fb87d59da1b9cceb7e8e0561417087 Mon Sep 17 00:00:00 2001 From: Noah Lewis <47840925+TheAssembler1@users.noreply.github.com> Date: Tue, 22 Apr 2025 13:21:10 -0400 Subject: [PATCH 01/43] Create codeql-config.yml --- .github/codeql-config.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/codeql-config.yml diff --git a/.github/codeql-config.yml b/.github/codeql-config.yml new file mode 100644 index 000000000..7adbf6792 --- /dev/null +++ b/.github/codeql-config.yml @@ -0,0 +1,31 @@ +# Query filters to include or exclude specific queries +query-filters: + - exclude: + # See: https://codeql.github.com/codeql-query-help/cpp/cpp-short-global-name/ + id: cpp/short-global-name + - exclude: + # See: https://codeql.github.com/codeql-query-help/cpp/cpp-commented-out-code/ + id: cpp/commented-out-code + - exclude: + # See: https://codeql.github.com/codeql-query-help/cpp/cpp-poorly-documented-function/ + id: cpp/poorly-documented-function + - exclude: + # See: https://codeql.github.com/codeql-query-help/cpp/cpp-trivial-switch/ + id: cpp/trivial-switch + - exclude: + # See: https://codeql.github.com/codeql-query-help/cpp/cpp-irregular-enum-init/ + id: cpp/irregular-enum-init + - exclude: + # See: https://codeql.github.com/codeql-query-help/cpp/cpp-guarded-free/ + id: cpp/guarded-free + +# Directories to scan for vulnerabilities +paths: + - src + +# Directories and files to ignore during the scan +paths-ignore: + - scripts + - examples + - docs + - benchmark From c4a25247f9f71cfb2b71df31c637d4c619a607b7 Mon Sep 17 00:00:00 2001 From: Noah Lewis <47840925+TheAssembler1@users.noreply.github.com> Date: Tue, 22 Apr 2025 13:21:55 -0400 Subject: [PATCH 02/43] Create codeql.yml --- .github/workflows/codeql.yml | 119 +++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 000000000..a47051341 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,119 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL Advanced" + +env: + CMAKE_POLICY_VERSION_MINIMUM: 3.5 + +on: + push: + branches: [ "stable" ] + pull_request: + branches: [ "stable" ] + schedule: + - cron: '33 23 * * 2' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: actions + build-mode: none + - language: c-cpp + build-mode: manual + - language: python + build-mode: none + # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Dependencies + run: | + sudo apt-get update + sudo apt-get install libopenmpi-dev libhdf5-dev uuid-dev cmake + + - name: Build PDC Dependencies + run: | + # libfabric + wget https://github.com/ofiwg/libfabric/archive/refs/tags/v1.12.1.tar.gz + tar xf v1.12.1.tar.gz + cd libfabric-1.12.1 + ./autogen.sh + ./configure --disable-usnic --disable-mrail --disable-rstream --disable-perf --disable-efa --disable-psm2 --disable-psm --disable-verbs --disable-shm --disable-static --disable-silent-rules + make -j2 && sudo make install + cd .. + + # Mercury + git clone --recursive https://github.com/mercury-hpc/mercury.git + cd mercury + git checkout v2.2.0 + mkdir build && cd build + cmake ../ -DCMAKE_C_COMPILER=gcc -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON -DNA_USE_OFI=ON -DNA_USE_SM=OFF -DMERCURY_USE_CHECKSUMS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + make -j2 && sudo make install + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + config-file: ./.github/codeql-config.yml + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + - name: Build PDC + shell: bash + run: | + mkdir build && cd build + cmake ../ -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DPDC_SERVER_CACHE=ON -DBUILD_TESTING=ON -DPDC_ENABLE_MPI=ON -DCMAKE_C_COMPILER=mpicc -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + make -j2 && sudo make install + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" From c683a54d01f84ebc6afc607773f98e3d3ec03a6a Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 10:23:18 -0700 Subject: [PATCH 03/43] test --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test diff --git a/test b/test new file mode 100644 index 000000000..e69de29bb From a40bdfc5bc768832e67bf52656c456b6085e03f8 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 10:24:17 -0700 Subject: [PATCH 04/43] remvoe --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index e69de29bb..000000000 From 4abc540ab352a5c4458fce668495f13da5ae9222 Mon Sep 17 00:00:00 2001 From: Noah Lewis <47840925+TheAssembler1@users.noreply.github.com> Date: Tue, 22 Apr 2025 13:24:46 -0400 Subject: [PATCH 05/43] Update codeql.yml --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a47051341..7fc0e4af0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -16,7 +16,7 @@ env: on: push: - branches: [ "stable" ] + branches: [ "pdc_codeql" ] pull_request: branches: [ "stable" ] schedule: From 21b7c27712ad219aaeb7fe90bbb372f9eeee0026 Mon Sep 17 00:00:00 2001 From: Noah Lewis <47840925+TheAssembler1@users.noreply.github.com> Date: Tue, 22 Apr 2025 13:30:50 -0400 Subject: [PATCH 06/43] Update codeql.yml --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7fc0e4af0..ac3271f01 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -18,7 +18,7 @@ on: push: branches: [ "pdc_codeql" ] pull_request: - branches: [ "stable" ] + branches: [ "pdc_codeql" ] schedule: - cron: '33 23 * * 2' From 29a83f9e998b6b4ae7e0214205a0ce400bd42f03 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 11:19:19 -0700 Subject: [PATCH 07/43] 1 --- src/api/pdc_obj/pdc_obj.c | 10 ++++++++-- src/commons/utils/Readme.md | 0 2 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 src/commons/utils/Readme.md diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index 18e62382e..2298f79d2 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -867,15 +867,21 @@ PDCprop_set_obj_dims(pdcid_t obj_prop, PDC_int_t ndim, uint64_t *dims) info = PDC_find_id(obj_prop); if (info == NULL) PGOTO_ERROR(FAIL, "cannot locate object property ID"); + prop = (struct _pdc_obj_prop *)(info->obj_ptr); if (ndim > (PDC_int_t)prop->obj_prop_pub->ndim) { if (prop->obj_prop_pub->ndim > 0) { - free(prop->obj_prop_pub->dims); + PDC_free(prop->obj_prop_pub->dims); + prop->obj_prop_pub->dims = NULL; } prop->obj_prop_pub->dims = (uint64_t *)malloc(ndim * sizeof(uint64_t)); prop->obj_prop_pub->ndim = ndim; } - memcpy(prop->obj_prop_pub->dims, dims, ndim * sizeof(uint64_t)); + + if(prop->obj_prop_pub->dims != NULL) + memcpy(prop->obj_prop_pub->dims, dims, ndim * sizeof(uint64_t)); + else + PGOTO_ERROR(FAIL, "prop->obj_prop->dims was NULL"); done: fflush(stdout); diff --git a/src/commons/utils/Readme.md b/src/commons/utils/Readme.md deleted file mode 100644 index e69de29bb..000000000 From e05598fdc478916a112f142afe1fe29d7c2c1e18 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Apr 2025 18:20:40 +0000 Subject: [PATCH 08/43] Committing clang-format changes --- src/api/pdc_obj/pdc_obj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index 2298f79d2..96e424c5b 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -867,7 +867,7 @@ PDCprop_set_obj_dims(pdcid_t obj_prop, PDC_int_t ndim, uint64_t *dims) info = PDC_find_id(obj_prop); if (info == NULL) PGOTO_ERROR(FAIL, "cannot locate object property ID"); - + prop = (struct _pdc_obj_prop *)(info->obj_ptr); if (ndim > (PDC_int_t)prop->obj_prop_pub->ndim) { if (prop->obj_prop_pub->ndim > 0) { @@ -878,9 +878,9 @@ PDCprop_set_obj_dims(pdcid_t obj_prop, PDC_int_t ndim, uint64_t *dims) prop->obj_prop_pub->ndim = ndim; } - if(prop->obj_prop_pub->dims != NULL) + if (prop->obj_prop_pub->dims != NULL) memcpy(prop->obj_prop_pub->dims, dims, ndim * sizeof(uint64_t)); - else + else PGOTO_ERROR(FAIL, "prop->obj_prop->dims was NULL"); done: From 281dacf740a6490419117d18eb63dea2d49e5dcb Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 11:35:44 -0700 Subject: [PATCH 09/43] more --- src/tests/llsm_idioms_bench.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/llsm_idioms_bench.c index 8f447f5d5..b7682df48 100644 --- a/src/tests/llsm_idioms_bench.c +++ b/src/tests/llsm_idioms_bench.c @@ -253,8 +253,16 @@ csv_tags_on_objects(pdcid_t *obj_ids, char ***csv_data, char **csv_header, int n char *attr_value = strdup(row[col_idx]); if (strstr(attr_value, "Scan_Iter_0000")) { char *start = strstr(attr_value, "Scan_Iter_0000"); + if (strlen(start) < strlen(new_iter_value)) { + LOG_ERROR("start string is too small"); + return 0; + } strncpy(start, new_iter_value, strlen(new_iter_value)); char *zerot = strstr(attr_value, "0000t.tif"); + if (strlen(zerot) < strlen(new_iter_tok)) { + LOG_ERROR("zerot string is too small"); + return 0; + } strncpy(zerot, new_iter_tok, strlen(new_iter_tok)); if (startsWith(attr_name, "Filepath")) { From de0b04de7a6563276a28d09f91e42b83fda42e79 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 11:50:04 -0700 Subject: [PATCH 10/43] update --- src/tests/llsm_idioms_bench.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/llsm_idioms_bench.c index b7682df48..d7c4d7200 100644 --- a/src/tests/llsm_idioms_bench.c +++ b/src/tests/llsm_idioms_bench.c @@ -253,17 +253,9 @@ csv_tags_on_objects(pdcid_t *obj_ids, char ***csv_data, char **csv_header, int n char *attr_value = strdup(row[col_idx]); if (strstr(attr_value, "Scan_Iter_0000")) { char *start = strstr(attr_value, "Scan_Iter_0000"); - if (strlen(start) < strlen(new_iter_value)) { - LOG_ERROR("start string is too small"); - return 0; - } - strncpy(start, new_iter_value, strlen(new_iter_value)); + strncpy(start, new_iter_value, PDC_MIN(strlen(new_iter_value), strlen(start))); char *zerot = strstr(attr_value, "0000t.tif"); - if (strlen(zerot) < strlen(new_iter_tok)) { - LOG_ERROR("zerot string is too small"); - return 0; - } - strncpy(zerot, new_iter_tok, strlen(new_iter_tok)); + strncpy(zerot, new_iter_tok, PDC_MIN(strlen(new_iter_tok), strlen(zerot))); if (startsWith(attr_name, "Filepath")) { sprintf(extra_attr_value, "%s", attr_value); From 36b846fc106979eb57c31edd12db340e430eda7a Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 12:18:08 -0700 Subject: [PATCH 11/43] another --- src/commons/utils/query_utils.c | 54 ++++++++++++++++++++-------- src/server/pdc_server_metadata.c | 61 +++++++++++++++++++------------- 2 files changed, 76 insertions(+), 39 deletions(-) diff --git a/src/commons/utils/query_utils.c b/src/commons/utils/query_utils.c index c1a02372e..c7db44a99 100644 --- a/src/commons/utils/query_utils.c +++ b/src/commons/utils/query_utils.c @@ -89,18 +89,29 @@ gen_query_key_value(query_gen_input_t *input, query_gen_output_t *output) // process value in base_tag if (is_PDC_STRING(input->base_tag->type)) { char *temp_value = NULL; - value_ptr_len = _gen_affix_for_token((char *)input->base_tag->value, input->value_query_type, + value_ptr_len = _gen_affix_for_token((char *)input->base_tag->value, + input->value_query_type, affix_len, &temp_value); - value_ptr = (char *)calloc(value_ptr_len + 3, sizeof(char)); - value_ptr[0] = '"'; - strcat(value_ptr, temp_value); - value_ptr[value_ptr_len + 1] = '"'; - value_ptr[value_ptr_len + 2] = '\0'; - - if (value_ptr_len == 0) { + + if (value_ptr_len == 0 || temp_value == NULL) { LOG_ERROR("Failed to generate value query!\n"); return; } + + // Allocate space for: '"' + temp_value + '"' + '\0' + value_ptr = (char *)calloc(value_ptr_len + 3, sizeof(char)); + if (!value_ptr) { + LOG_ERROR("Memory allocation failed for value_ptr"); + return; + } + + int written = snprintf(value_ptr, value_ptr_len + 3, "\"%s\"", temp_value); + if (written < 0 || written >= value_ptr_len + 3) { + LOG_ERROR("Value string formatting failed or was truncated"); + free(value_ptr); + value_ptr = NULL; + return; + } } else { if (is_PDC_INT(input->base_tag->type)) { @@ -143,17 +154,30 @@ gen_query_key_value(query_gen_input_t *input, query_gen_output_t *output) output->value_query_len = value_ptr_len; } -char * -gen_query_str(query_gen_output_t *query_gen_output) +char *gen_query_str(query_gen_output_t *query_gen_output) { - char *final_query_str = - (char *)calloc(query_gen_output->key_query_len + query_gen_output->value_query_len + 2, sizeof(char)); - strcat(final_query_str, query_gen_output->key_query); - strcat(final_query_str, "="); - strcat(final_query_str, query_gen_output->value_query); + // Allocate space for the final query string: + size_t total_len = query_gen_output->key_query_len + query_gen_output->value_query_len + 2; + char *final_query_str = (char *)calloc(total_len + 1, sizeof(char)); + + if (!final_query_str) { + LOG_ERROR("Memory allocation failed for final_query_str"); + return NULL; + } + + // Build the query string using snprintf for safety + int written = snprintf(final_query_str, total_len + 1, "%s=%s", query_gen_output->key_query, query_gen_output->value_query); + + if (written < 0 || (size_t)written >= total_len) { + LOG_ERROR("Failed to generate query string or it was truncated"); + free(final_query_str); + return NULL; + } + return final_query_str; } + void free_query_output(query_gen_output_t *output) { diff --git a/src/server/pdc_server_metadata.c b/src/server/pdc_server_metadata.c index 465433242..cb1c42300 100644 --- a/src/server/pdc_server_metadata.c +++ b/src/server/pdc_server_metadata.c @@ -700,33 +700,34 @@ PDC_Server_add_tag_metadata(metadata_add_tag_in_t *in, metadata_add_tag_out_t *o // obj_name change is done through client with delete and add operation. if (in->new_tag != NULL && in->new_tag[0] != 0 && !(in->new_tag[0] == ' ' && in->new_tag[1] == 0)) { - // add a ',' to separate different tags - target->tags[strlen(target->tags) + 1] = 0; - target->tags[strlen(target->tags)] = ','; - strcat(target->tags, in->new_tag); - out->ret = 1; + size_t tag_len = strlen(target->tags); + size_t space_left = TAG_LEN_MAX - tag_len; + + if (space_left <= 1) { + PGOTO_ERROR(FAIL, "Not enough space to append comma"); + } + + int written = snprintf(target->tags + tag_len, space_left, ",%s", in->new_tag); + if (written < 0 || (size_t)written >= space_left) { + PGOTO_ERROR(FAIL, "Not enough space in target->tags to append new_tag with snprintf"); + } } else - out->ret = -1; + out->ret = FAIL; } // end if (target != NULL) else { // Object not found for deletion request - LOG_ERROR("==PDC_SERVER: add tag target not found 1!\n"); - out->ret = -1; + PGOTO_ERROR(FAIL, "==PDC_SERVER: add tag target not found 1!\n"); } } // end if lookup_value != NULL else { - LOG_ERROR("==PDC_SERVER: add tag target not found 2!\n"); - out->ret = -1; + PGOTO_ERROR(FAIL, "==PDC_SERVER: add tag target not found 2!\n"); } } // if (metadata_hash_table_g != NULL) else { - LOG_ERROR("==PDC_SERVER: metadata_hash_table_g not initilized!\n"); - ret_value = FAIL; - out->ret = -1; - goto done; + PGOTO_ERROR(FAIL, "==PDC_SERVER: metadata_hash_table_g not initilized!\n"); } if (ret_value != SUCCEED) { @@ -825,10 +826,17 @@ PDC_Server_update_metadata(metadata_update_in_t *in, metadata_update_out_t *out) strcpy(target->data_location, in->new_metadata.data_location); if (in->new_metadata.tags[0] != 0 && !(in->new_metadata.tags[0] == ' ' && in->new_metadata.tags[1] == 0)) { - // add a ',' to separate different tags - target->tags[strlen(target->tags) + 1] = 0; - target->tags[strlen(target->tags)] = ','; - strcat(target->tags, in->new_metadata.tags); + size_t tag_len = strlen(target->tags); + size_t space_left = TAG_LEN_MAX - tag_len; + + if (space_left <= 1) { + PGOTO_ERROR(FAIL, "Not enough space to append comma"); + } + + int written = snprintf(target->tags + tag_len, space_left, ",%s", in->new_metadata.tags); + if (written < 0 || (size_t)written >= space_left) { + PGOTO_ERROR(FAIL, "Not enough space in target->tags to append new_metadata.tags with snprintf"); + } } if (in->new_metadata.current_state != 0) { target->transform_state = in->new_metadata.current_state; @@ -2553,16 +2561,21 @@ PDC_Server_container_add_tags(uint64_t cont_id, char *tags) FUNC_ENTER(NULL); ret_value = PDC_Server_find_container_by_id(cont_id, &cont_entry); - if (cont_entry != NULL) { + if (cont_entry != NULL && tags != NULL) { + size_t tag_len = strlen(cont_entry->tags); + size_t space_left = TAG_LEN_MAX - tag_len; + + if (space_left <= 1) { + PGOTO_ERROR(FAIL, "Not enough space in cont_entry->tags to append new tags!"); + } - if (tags != NULL) { - strcat(cont_entry->tags, tags); + int written = snprintf(cont_entry->tags + tag_len, space_left, "%s", tags); + if (written < 0 || (size_t)written >= space_left) { + PGOTO_ERROR(FAIL, "Truncated tag append in cont_entry->tags!"); } } else { - LOG_ERROR("==PDC_SERVER[%d]: container %" PRIu64 " not found!\n", pdc_server_rank_g, cont_id); - ret_value = FAIL; - goto done; + PGOTO_ERROR(FAIL, "==PDC_SERVER[%d]: container %" PRIu64 " not found!\n", pdc_server_rank_g, cont_id); } done: From 3ba56475631dba8531b352111aeba95d2a6dc7a1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Apr 2025 19:18:34 +0000 Subject: [PATCH 12/43] Committing clang-format changes --- src/commons/utils/query_utils.c | 20 +++++++------- src/server/pdc_server_metadata.c | 46 +++++++++++++++++--------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/commons/utils/query_utils.c b/src/commons/utils/query_utils.c index c7db44a99..87ea9ce31 100644 --- a/src/commons/utils/query_utils.c +++ b/src/commons/utils/query_utils.c @@ -89,22 +89,21 @@ gen_query_key_value(query_gen_input_t *input, query_gen_output_t *output) // process value in base_tag if (is_PDC_STRING(input->base_tag->type)) { char *temp_value = NULL; - value_ptr_len = _gen_affix_for_token((char *)input->base_tag->value, - input->value_query_type, + value_ptr_len = _gen_affix_for_token((char *)input->base_tag->value, input->value_query_type, affix_len, &temp_value); - + if (value_ptr_len == 0 || temp_value == NULL) { LOG_ERROR("Failed to generate value query!\n"); return; } - + // Allocate space for: '"' + temp_value + '"' + '\0' value_ptr = (char *)calloc(value_ptr_len + 3, sizeof(char)); if (!value_ptr) { LOG_ERROR("Memory allocation failed for value_ptr"); return; } - + int written = snprintf(value_ptr, value_ptr_len + 3, "\"%s\"", temp_value); if (written < 0 || written >= value_ptr_len + 3) { LOG_ERROR("Value string formatting failed or was truncated"); @@ -154,11 +153,12 @@ gen_query_key_value(query_gen_input_t *input, query_gen_output_t *output) output->value_query_len = value_ptr_len; } -char *gen_query_str(query_gen_output_t *query_gen_output) +char * +gen_query_str(query_gen_output_t *query_gen_output) { // Allocate space for the final query string: - size_t total_len = query_gen_output->key_query_len + query_gen_output->value_query_len + 2; - char *final_query_str = (char *)calloc(total_len + 1, sizeof(char)); + size_t total_len = query_gen_output->key_query_len + query_gen_output->value_query_len + 2; + char * final_query_str = (char *)calloc(total_len + 1, sizeof(char)); if (!final_query_str) { LOG_ERROR("Memory allocation failed for final_query_str"); @@ -166,7 +166,8 @@ char *gen_query_str(query_gen_output_t *query_gen_output) } // Build the query string using snprintf for safety - int written = snprintf(final_query_str, total_len + 1, "%s=%s", query_gen_output->key_query, query_gen_output->value_query); + int written = snprintf(final_query_str, total_len + 1, "%s=%s", query_gen_output->key_query, + query_gen_output->value_query); if (written < 0 || (size_t)written >= total_len) { LOG_ERROR("Failed to generate query string or it was truncated"); @@ -177,7 +178,6 @@ char *gen_query_str(query_gen_output_t *query_gen_output) return final_query_str; } - void free_query_output(query_gen_output_t *output) { diff --git a/src/server/pdc_server_metadata.c b/src/server/pdc_server_metadata.c index cb1c42300..d6c6a9daa 100644 --- a/src/server/pdc_server_metadata.c +++ b/src/server/pdc_server_metadata.c @@ -700,17 +700,17 @@ PDC_Server_add_tag_metadata(metadata_add_tag_in_t *in, metadata_add_tag_out_t *o // obj_name change is done through client with delete and add operation. if (in->new_tag != NULL && in->new_tag[0] != 0 && !(in->new_tag[0] == ' ' && in->new_tag[1] == 0)) { - size_t tag_len = strlen(target->tags); - size_t space_left = TAG_LEN_MAX - tag_len; - - if (space_left <= 1) { - PGOTO_ERROR(FAIL, "Not enough space to append comma"); - } - - int written = snprintf(target->tags + tag_len, space_left, ",%s", in->new_tag); - if (written < 0 || (size_t)written >= space_left) { - PGOTO_ERROR(FAIL, "Not enough space in target->tags to append new_tag with snprintf"); - } + size_t tag_len = strlen(target->tags); + size_t space_left = TAG_LEN_MAX - tag_len; + + if (space_left <= 1) { + PGOTO_ERROR(FAIL, "Not enough space to append comma"); + } + + int written = snprintf(target->tags + tag_len, space_left, ",%s", in->new_tag); + if (written < 0 || (size_t)written >= space_left) { + PGOTO_ERROR(FAIL, "Not enough space in target->tags to append new_tag with snprintf"); + } } else out->ret = FAIL; @@ -826,17 +826,19 @@ PDC_Server_update_metadata(metadata_update_in_t *in, metadata_update_out_t *out) strcpy(target->data_location, in->new_metadata.data_location); if (in->new_metadata.tags[0] != 0 && !(in->new_metadata.tags[0] == ' ' && in->new_metadata.tags[1] == 0)) { - size_t tag_len = strlen(target->tags); - size_t space_left = TAG_LEN_MAX - tag_len; - - if (space_left <= 1) { - PGOTO_ERROR(FAIL, "Not enough space to append comma"); - } - - int written = snprintf(target->tags + tag_len, space_left, ",%s", in->new_metadata.tags); - if (written < 0 || (size_t)written >= space_left) { - PGOTO_ERROR(FAIL, "Not enough space in target->tags to append new_metadata.tags with snprintf"); - } + size_t tag_len = strlen(target->tags); + size_t space_left = TAG_LEN_MAX - tag_len; + + if (space_left <= 1) { + PGOTO_ERROR(FAIL, "Not enough space to append comma"); + } + + int written = snprintf(target->tags + tag_len, space_left, ",%s", in->new_metadata.tags); + if (written < 0 || (size_t)written >= space_left) { + PGOTO_ERROR( + FAIL, + "Not enough space in target->tags to append new_metadata.tags with snprintf"); + } } if (in->new_metadata.current_state != 0) { target->transform_state = in->new_metadata.current_state; From cda18bca7548795840c80c88557174748f47c3c6 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 12:29:31 -0700 Subject: [PATCH 13/43] another --- src/commons/logging/pdc_logger.c | 7 +++++-- src/commons/utils/pdc_timing.c | 20 +++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/commons/logging/pdc_logger.c b/src/commons/logging/pdc_logger.c index 86618222b..bbc316ef7 100644 --- a/src/commons/logging/pdc_logger.c +++ b/src/commons/logging/pdc_logger.c @@ -48,9 +48,12 @@ rotate_log_file(PDC_LogLevel level) char newFilename[MAX_LOG_FILE_NAME_LENGTH]; char timeStr[20]; time_t rawtime = time(NULL); - struct tm *timeinfo = localtime(&rawtime); + struct tm timeinfo; - strftime(timeStr, 20, "%Y%m%d%H:%M:%S", timeinfo); + // Use localtime_r for thread safety + localtime_r(&rawtime, &timeinfo); + + strftime(timeStr, sizeof(timeStr), "%Y%m%d%H:%M:%S", &timeinfo); newFilename[strlen(newFilename) - 1] = '\0'; // Remove trailing newline snprintf(newFilename, MAX_LOG_FILE_NAME_LENGTH, "%s_%s", logFilenames[level], timeStr); diff --git a/src/commons/utils/pdc_timing.c b/src/commons/utils/pdc_timing.c index 0adea269a..2ca53cce2 100644 --- a/src/commons/utils/pdc_timing.c +++ b/src/commons/utils/pdc_timing.c @@ -552,17 +552,23 @@ PDC_get_rank() #endif } -inline void -PDC_get_time_str(char *cur_time) +inline void PDC_get_time_str(char *cur_time) { struct timespec ts; + struct tm tm_info; assert(cur_time); clock_gettime(CLOCK_REALTIME, &ts); - sprintf(cur_time, "%04d-%02d-%02d %02d:%02d:%02d.%06ld", 1900 + localtime(&ts.tv_sec)->tm_year, - localtime(&ts.tv_sec)->tm_mon + 1, localtime(&ts.tv_sec)->tm_mday, localtime(&ts.tv_sec)->tm_hour, - localtime(&ts.tv_sec)->tm_min, localtime(&ts.tv_sec)->tm_sec, ts.tv_nsec / 1000); - + localtime_r(&ts.tv_sec, &tm_info); + sprintf(cur_time, "%04d-%02d-%02d %02d:%02d:%02d.%06ld", + 1900 + tm_info.tm_year, + tm_info.tm_mon + 1, + tm_info.tm_mday, + tm_info.tm_hour, + tm_info.tm_min, + tm_info.tm_sec, + ts.tv_nsec / 1000); + return; -} +} \ No newline at end of file From 1a846e5927c44aec8bfbe690212891ca0a13a0ae Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Apr 2025 19:29:59 +0000 Subject: [PATCH 14/43] Committing clang-format changes --- src/commons/logging/pdc_logger.c | 6 +++--- src/commons/utils/pdc_timing.c | 17 ++++++----------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/commons/logging/pdc_logger.c b/src/commons/logging/pdc_logger.c index bbc316ef7..0d93221e8 100644 --- a/src/commons/logging/pdc_logger.c +++ b/src/commons/logging/pdc_logger.c @@ -45,9 +45,9 @@ rotate_log_file(PDC_LogLevel level) logFiles[level] = NULL; } - char newFilename[MAX_LOG_FILE_NAME_LENGTH]; - char timeStr[20]; - time_t rawtime = time(NULL); + char newFilename[MAX_LOG_FILE_NAME_LENGTH]; + char timeStr[20]; + time_t rawtime = time(NULL); struct tm timeinfo; // Use localtime_r for thread safety diff --git a/src/commons/utils/pdc_timing.c b/src/commons/utils/pdc_timing.c index 2ca53cce2..bfec86658 100644 --- a/src/commons/utils/pdc_timing.c +++ b/src/commons/utils/pdc_timing.c @@ -552,23 +552,18 @@ PDC_get_rank() #endif } -inline void PDC_get_time_str(char *cur_time) +inline void +PDC_get_time_str(char *cur_time) { struct timespec ts; - struct tm tm_info; + struct tm tm_info; assert(cur_time); clock_gettime(CLOCK_REALTIME, &ts); localtime_r(&ts.tv_sec, &tm_info); - sprintf(cur_time, "%04d-%02d-%02d %02d:%02d:%02d.%06ld", - 1900 + tm_info.tm_year, - tm_info.tm_mon + 1, - tm_info.tm_mday, - tm_info.tm_hour, - tm_info.tm_min, - tm_info.tm_sec, - ts.tv_nsec / 1000); - + sprintf(cur_time, "%04d-%02d-%02d %02d:%02d:%02d.%06ld", 1900 + tm_info.tm_year, tm_info.tm_mon + 1, + tm_info.tm_mday, tm_info.tm_hour, tm_info.tm_min, tm_info.tm_sec, ts.tv_nsec / 1000); + return; } \ No newline at end of file From 7bfd764fad18e53f6222443cd91dd439b0df3a0d Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 12:47:19 -0700 Subject: [PATCH 15/43] another --- src/api/pdc_obj/pdc_obj.c | 2 +- src/server/pdc_server_region/pdc_server_data.c | 6 +++--- src/tests/read_obj_shared.c | 2 +- src/tests/write_obj_shared.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index 96e424c5b..14b67350f 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -205,7 +205,7 @@ PDC_Client_attach_metadata_to_local_obj(const char *obj_name, uint64_t obj_id, u if (NULL != obj_info->obj_pt->app_name) strcpy(((pdc_metadata_t *)obj_info->metadata)->app_name, obj_info->obj_pt->app_name); if (NULL != obj_name) - strcpy(((pdc_metadata_t *)obj_info->metadata)->obj_name, obj_name); + strncpy(((pdc_metadata_t *)obj_info->metadata)->obj_name, obj_name, sizeof(((pdc_metadata_t *)obj_info->metadata)->obj_name)); ((pdc_metadata_t *)obj_info->metadata)->time_step = obj_info->obj_pt->time_step; ((pdc_metadata_t *)obj_info->metadata)->obj_id = obj_id; ((pdc_metadata_t *)obj_info->metadata)->cont_id = cont_id; diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 35d000b5a..ad9d89ade 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -1907,7 +1907,7 @@ PDC_Server_cache_region_to_BB(region_list_t *region) if (pdc_cache_file_ptr_g == NULL) { char *bb_data_path = getenv("PDC_BB_LOC"); if (bb_data_path != NULL) { - sprintf(pdc_cache_file_path_g, "%s/PDCcacheBB.%d", bb_data_path, pdc_server_rank_g); + snprintf(pdc_cache_file_path_g, sizeof(pdc_cache_file_path_g), "%s/PDCcacheBB.%d", bb_data_path, pdc_server_rank_g); } else { char *user_specified_data_path = getenv("PDC_DATA_LOC"); @@ -1918,7 +1918,7 @@ PDC_Server_cache_region_to_BB(region_list_t *region) if (bb_data_path == NULL) bb_data_path = "."; } - sprintf(pdc_cache_file_path_g, "%s/PDCcacheBB.%d", bb_data_path, pdc_server_rank_g); + snprintf(pdc_cache_file_path_g, sizeof(pdc_cache_file_path_g), "%s/PDCcacheBB.%d", bb_data_path, pdc_server_rank_g); LOG_ERROR("==PDC_SERVER[%d]: No PDC_BB_LOC specified, use [%s]!\n", pdc_server_rank_g, bb_data_path); } @@ -4430,7 +4430,7 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, } request_region->ndim = region_info->ndim; request_region->unit_size = unit; - strcpy(request_region->storage_location, region->storage_location); + strncpy(request_region->storage_location, region->storage_location, sizeof(request_region->storage_location)); #ifdef ENABLE_TIMING struct timeval pdc_timer_start, pdc_timer_end; double write_total_sec; diff --git a/src/tests/read_obj_shared.c b/src/tests/read_obj_shared.c index f75eb6c51..8d062ad39 100644 --- a/src/tests/read_obj_shared.c +++ b/src/tests/read_obj_shared.c @@ -62,7 +62,7 @@ main(int argc, char **argv) return ret_value; } - sprintf(obj_name, "%s", argv[1]); + snprintf(obj_name, sizeof(obj_name), "%s", argv[1]); size_MB = atoi(argv[2]); diff --git a/src/tests/write_obj_shared.c b/src/tests/write_obj_shared.c index 51125a1bd..6e3184602 100644 --- a/src/tests/write_obj_shared.c +++ b/src/tests/write_obj_shared.c @@ -66,7 +66,7 @@ main(int argc, char **argv) return ret_value; } - sprintf(obj_name, "%s", argv[1]); + snprintf(obj_name, sizeof(obj_name), "%s", argv[1]); size_MB = atoi(argv[2]); From 079f1674a69ccacdd02246c5962bd082d9af79ea Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Apr 2025 19:47:45 +0000 Subject: [PATCH 16/43] Committing clang-format changes --- src/api/pdc_obj/pdc_obj.c | 3 ++- src/server/pdc_server_region/pdc_server_data.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index 14b67350f..25210dc53 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -205,7 +205,8 @@ PDC_Client_attach_metadata_to_local_obj(const char *obj_name, uint64_t obj_id, u if (NULL != obj_info->obj_pt->app_name) strcpy(((pdc_metadata_t *)obj_info->metadata)->app_name, obj_info->obj_pt->app_name); if (NULL != obj_name) - strncpy(((pdc_metadata_t *)obj_info->metadata)->obj_name, obj_name, sizeof(((pdc_metadata_t *)obj_info->metadata)->obj_name)); + strncpy(((pdc_metadata_t *)obj_info->metadata)->obj_name, obj_name, + sizeof(((pdc_metadata_t *)obj_info->metadata)->obj_name)); ((pdc_metadata_t *)obj_info->metadata)->time_step = obj_info->obj_pt->time_step; ((pdc_metadata_t *)obj_info->metadata)->obj_id = obj_id; ((pdc_metadata_t *)obj_info->metadata)->cont_id = cont_id; diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index ad9d89ade..20b7e46cc 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -1907,7 +1907,8 @@ PDC_Server_cache_region_to_BB(region_list_t *region) if (pdc_cache_file_ptr_g == NULL) { char *bb_data_path = getenv("PDC_BB_LOC"); if (bb_data_path != NULL) { - snprintf(pdc_cache_file_path_g, sizeof(pdc_cache_file_path_g), "%s/PDCcacheBB.%d", bb_data_path, pdc_server_rank_g); + snprintf(pdc_cache_file_path_g, sizeof(pdc_cache_file_path_g), "%s/PDCcacheBB.%d", bb_data_path, + pdc_server_rank_g); } else { char *user_specified_data_path = getenv("PDC_DATA_LOC"); @@ -1918,7 +1919,8 @@ PDC_Server_cache_region_to_BB(region_list_t *region) if (bb_data_path == NULL) bb_data_path = "."; } - snprintf(pdc_cache_file_path_g, sizeof(pdc_cache_file_path_g), "%s/PDCcacheBB.%d", bb_data_path, pdc_server_rank_g); + snprintf(pdc_cache_file_path_g, sizeof(pdc_cache_file_path_g), "%s/PDCcacheBB.%d", bb_data_path, + pdc_server_rank_g); LOG_ERROR("==PDC_SERVER[%d]: No PDC_BB_LOC specified, use [%s]!\n", pdc_server_rank_g, bb_data_path); } @@ -4430,7 +4432,8 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, } request_region->ndim = region_info->ndim; request_region->unit_size = unit; - strncpy(request_region->storage_location, region->storage_location, sizeof(request_region->storage_location)); + strncpy(request_region->storage_location, region->storage_location, + sizeof(request_region->storage_location)); #ifdef ENABLE_TIMING struct timeval pdc_timer_start, pdc_timer_end; double write_total_sec; From 4d4964f0267d8e755d4b56e9bfd990f892ae91fd Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 12:56:28 -0700 Subject: [PATCH 17/43] another --- src/api/pdc_client_connect.c | 35 ++----------------- .../pdc_server_region/pdc_server_data.c | 4 +-- src/tests/dart_test.c | 8 ++--- src/tests/read_obj.c | 2 +- 4 files changed, 9 insertions(+), 40 deletions(-) diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index 50e299565..5c40c0e9f 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -1572,9 +1572,9 @@ PDC_Client_init() // Get up tmp dir env var tmp_dir = getenv("PDC_TMPDIR"); if (tmp_dir == NULL) - strcpy(pdc_client_tmp_dir_g, "./pdc_tmp"); + strncpy(pdc_client_tmp_dir_g, "./pdc_tmp", sizeof(pdc_client_tmp_dir_g)); else - strcpy(pdc_client_tmp_dir_g, tmp_dir); + strncpy(pdc_client_tmp_dir_g, tmp_dir, sizeof(pdc_client_tmp_dir_g)); // Get debug environment var char *is_debug_env = getenv("PDC_DEBUG"); @@ -6183,38 +6183,7 @@ PDC_Client_all_server_checkpoint() fflush(stdout); FUNC_LEAVE(ret_value); } -/* -perr_t -PDC_Client_attach_metadata_to_local_obj(const char *obj_name, uint64_t obj_id, uint64_t cont_id, - uint32_t data_server_id, struct _pdc_obj_info *obj_info) -{ - perr_t ret_value = SUCCEED; - - FUNC_ENTER(NULL); - obj_info->metadata = (pdc_metadata_t *)calloc(1, sizeof(pdc_metadata_t)); - ((pdc_metadata_t *)obj_info->metadata)->user_id = obj_info->obj_pt->user_id; - if (NULL != obj_info->obj_pt->app_name) - strcpy(((pdc_metadata_t *)obj_info->metadata)->app_name, obj_info->obj_pt->app_name); - if (NULL != obj_name) - strcpy(((pdc_metadata_t *)obj_info->metadata)->obj_name, obj_name); - ((pdc_metadata_t *)obj_info->metadata)->time_step = obj_info->obj_pt->time_step; - ((pdc_metadata_t *)obj_info->metadata)->obj_id = obj_id; - ((pdc_metadata_t *)obj_info->metadata)->cont_id = cont_id; - ((pdc_metadata_t *)obj_info->metadata)->data_server_id = data_server_id; - if (NULL != obj_info->obj_pt->tags) - strcpy(((pdc_metadata_t *)obj_info->metadata)->tags, obj_info->obj_pt->tags); - if (NULL != obj_info->obj_pt->data_loc) - - strcpy(((pdc_metadata_t *)obj_info->metadata)->data_location, obj_info->obj_pt->data_loc); - ((pdc_metadata_t *)obj_info->metadata)->ndim = obj_info->obj_pt->obj_prop_pub->ndim; - if (NULL != obj_info->obj_pt->obj_prop_pub->dims) - memcpy(((pdc_metadata_t *)obj_info->metadata)->dims, obj_info->obj_pt->obj_prop_pub->dims, - sizeof(uint64_t) * obj_info->obj_pt->obj_prop_pub->ndim); - - FUNC_LEAVE(ret_value); -} -*/ perr_t PDC_Client_send_client_shm_info(uint32_t server_id, char *shm_addr, uint64_t size) { diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index ad9d89ade..f2148162b 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -1957,9 +1957,9 @@ PDC_Server_cache_region_to_BB(region_list_t *region) #endif // Prepare update - strcpy(region->storage_location, pdc_cache_file_path_g); + strncpy(region->storage_location, pdc_cache_file_path_g, sizeof(region->storage_location)); region->offset = offset; - strcpy(region->cache_location, pdc_cache_file_path_g); + strncpy(region->cache_location, pdc_cache_file_path_g, sizeof(region->cache_location)); region->cache_offset = offset; // Update storage meta diff --git a/src/tests/dart_test.c b/src/tests/dart_test.c index baee6b791..526566506 100644 --- a/src/tests/dart_test.c +++ b/src/tests/dart_test.c @@ -282,7 +282,7 @@ main(int argc, char **argv) char **query_input_list = (char **)calloc(word_count, sizeof(char *)); for (i = 0; i < word_count; i++) { query_input_list[i] = (char *)calloc((strlen(input_word_list[i]) + 1), sizeof(char)); - strcpy(query_input_list[i], input_word_list[i]); + strncpy(query_input_list[i], input_word_list[i], strlen(input_word_list[i]) + 1); } #ifdef ENABLE_MPI @@ -332,7 +332,7 @@ main(int argc, char **argv) for (i = 0; i < word_count; i++) { query_input_list[i] = (char *)calloc((strlen(input_word_list[i]) + 1), sizeof(char)); - strcpy(query_input_list[i], input_word_list[i]); + strncpy(query_input_list[i], input_word_list[i], (strlen(input_word_list[i]) + 1)); } #ifdef ENABLE_MPI @@ -384,7 +384,7 @@ main(int argc, char **argv) /* =============== Suffix Query testing ======================= */ for (i = 0; i < word_count; i++) { query_input_list[i] = (char *)calloc((strlen(input_word_list[i]) + 1), sizeof(char)); - strcpy(query_input_list[i], input_word_list[i]); + strncpy(query_input_list[i], input_word_list[i], (strlen(input_word_list[i]) + 1)); } #ifdef ENABLE_MPI @@ -437,7 +437,7 @@ main(int argc, char **argv) /* =============== Infix Query testing ======================= */ for (i = 0; i < word_count; i++) { query_input_list[i] = (char *)calloc((strlen(input_word_list[i]) + 1), sizeof(char)); - strcpy(query_input_list[i], input_word_list[i]); + strncpy(query_input_list[i], input_word_list[i], (strlen(input_word_list[i]) + 1)); } #ifdef ENABLE_MPI diff --git a/src/tests/read_obj.c b/src/tests/read_obj.c index 73f6198f2..2bb93b6f7 100644 --- a/src/tests/read_obj.c +++ b/src/tests/read_obj.c @@ -66,7 +66,7 @@ main(int argc, char **argv) return ret_value; } - sprintf(obj_name, "%s_%d", argv[1], rank); + snprintf(obj_name, sizeof(obj_name), "%s_%d", argv[1], rank); size_MB = atoi(argv[2]); From 2b35b5818887cb416d712b17f6cfef2de115f1f7 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 13:12:00 -0700 Subject: [PATCH 18/43] another --- src/tests/dart_algo_sim.c | 69 +++++++++++++++++++++------------------ src/tests/dart_test.c | 17 ++++------ 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/tests/dart_algo_sim.c b/src/tests/dart_algo_sim.c index e3514da27..ef68cf220 100644 --- a/src/tests/dart_algo_sim.c +++ b/src/tests/dart_algo_sim.c @@ -325,53 +325,60 @@ gen_random_strings_with_cb(int count, int minlen, int maxlen, int alphabet_size, return result; } -char ** -read_words_from_text(const char *fileName, int *word_count, int **req_count, int prefix_len, - insert_key_cb insert_cb, search_key_cb search_cb) -{ - - FILE *file = fopen(fileName, "r"); /* should check the result */ +char **read_words_from_text(const char *fileName, int *word_count, int **req_count, int prefix_len, + insert_key_cb insert_cb, search_key_cb search_cb) { + FILE *file = fopen(fileName, "r"); if (file == NULL) { - println("File not available\n"); + LOG_ERROR("File not available: %s\n", fileName); exit(4); } - int lines_allocated = 128; - int max_line_len = 512; - - int i; - int line_count = 0; - char *line = (char *)malloc(sizeof(char) * (2 * max_line_len)); - char *word = (char *)malloc(sizeof(char) * (max_line_len)); - for (i = 0; 1; i++) { - int j; - if (fgets(line, max_line_len - 1, file) == NULL) { - break; + + int max_line_len = 512; + char *line = malloc(2 * max_line_len); + char *word = malloc(max_line_len); + + if (!line || !word) { + LOG_ERROR("Memory allocation failed\n"); + fclose(file); + exit(1); + } + + int line_count = 0; + + while (fgets(line, max_line_len, file) != NULL) { + int j = strlen(line) - 1; + while (j >= 0 && (line[j] == '\n' || line[j] == '\r')) { + line[j--] = '\0'; + } + + if (strchr(line, '\n') == NULL && !feof(file)) { + LOG_ERROR("Input line too long at line %d, skipping.\n", line_count + 1); + int ch; + while ((ch = fgetc(file)) != '\n' && ch != EOF); + continue; } - /* Get rid of CR or LF at end of line */ - for (j = strlen(line) - 1; j >= 0 && (line[j] == '\n' || line[j] == '\r'); j--) - ; - line[j + 1] = '\0'; int rc; - sscanf(line, "%d %s", &rc, word); - // (*req_count)[line_count]=rc; + if (sscanf(line, "%d %511s", &rc, word) != 2) { + LOG_ERROR("Malformed line at line %d: '%s'\n", line_count + 1, line); + continue; + } - if (insert_cb != NULL && search_cb != NULL) { + if (insert_cb && search_cb) { insert_cb(word, prefix_len); - - int sch = 0; - for (sch = 0; sch < rc; sch++) { + for (int sch = 0; sch < rc; sch++) { search_cb(word, prefix_len); } } + line_count++; } + free(line); free(word); - *word_count = line_count; - //*total_word_count = i; - fclose(file); + + *word_count = line_count; return NULL; } diff --git a/src/tests/dart_test.c b/src/tests/dart_test.c index 526566506..27aaaacf8 100644 --- a/src/tests/dart_test.c +++ b/src/tests/dart_test.c @@ -54,9 +54,9 @@ char ** read_words_from_text(const char *fileName, int *word_count, int *total_word_count, int mpi_rank) { - FILE *file = fopen(fileName, "r"); /* should check the result */ + FILE *file = fopen(fileName, "r"); if (file == NULL) { - println("File not available\n"); + LOG_ERROR("File not available\n"); exit(4); } int lines_allocated = 128; @@ -73,15 +73,10 @@ read_words_from_text(const char *fileName, int *word_count, int *total_word_coun #ifdef ENABLE_MPI if (i % (mpi_rank + 1) != 0) { - // char *trash_skip_buf=(char *)calloc(max_line_len, sizeof(char)); char trash_skip_buf[512]; if (fgets(trash_skip_buf, max_line_len - 1, file) == NULL) { - // free(trash_skip_buf); break; } - // println("skip '%s'", trash_skip_buf); - // free(trash_skip_buf); - // i++; continue; } #endif @@ -295,7 +290,7 @@ main(int argc, char **argv) int data = i; char *key = query_input_list[i]; char query_str[100]; - sprintf(query_str, "%s=%s", key, key); + snprintf(query_str, 100 - 1, "%s=%s", key, key); uint64_t *out; int rest_count = 0; PDC_Client_search_obj_ref_through_dart(hash_algo, query_str, ref_type, &rest_count, &out); @@ -348,7 +343,7 @@ main(int argc, char **argv) key[4] = '\0'; // trim to prefix of 4. } char query_str[80]; - sprintf(query_str, "%s*=%s*", key, key); + snprintf(query_str, 80 - 1, "%s*=%s*", key, key); uint64_t *out; int rest_count = 0; PDC_Client_search_obj_ref_through_dart(hash_algo, query_str, ref_type, &rest_count, &out); @@ -401,7 +396,7 @@ main(int argc, char **argv) key = &key[key_len - 4]; // trim to suffix of 4. } char query_str[80]; - sprintf(query_str, "*%s=*%s", key, key); + snprintf(query_str, 80 - 1, "*%s=*%s", key, key); uint64_t *out; int rest_count = 0; PDC_Client_search_obj_ref_through_dart(hash_algo, query_str, ref_type, &rest_count, &out); @@ -457,7 +452,7 @@ main(int argc, char **argv) key[4] = '\0'; // trim to prefix of 4. } char query_str[80]; - sprintf(query_str, "*%s*=*%s*", key, key); + snprintf(query_str, 80 - 1, "*%s*=*%s*", key, key); uint64_t *out; int rest_count = 0; PDC_Client_search_obj_ref_through_dart(hash_algo, query_str, ref_type, &rest_count, &out); From 0587c028e4194a25d3d69ae4cd8ac2db436f9036 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Apr 2025 20:12:22 +0000 Subject: [PATCH 19/43] Committing clang-format changes --- src/tests/dart_algo_sim.c | 17 ++++++++++------- src/tests/dart_test.c | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/tests/dart_algo_sim.c b/src/tests/dart_algo_sim.c index ef68cf220..bfc92876d 100644 --- a/src/tests/dart_algo_sim.c +++ b/src/tests/dart_algo_sim.c @@ -325,17 +325,19 @@ gen_random_strings_with_cb(int count, int minlen, int maxlen, int alphabet_size, return result; } -char **read_words_from_text(const char *fileName, int *word_count, int **req_count, int prefix_len, - insert_key_cb insert_cb, search_key_cb search_cb) { +char ** +read_words_from_text(const char *fileName, int *word_count, int **req_count, int prefix_len, + insert_key_cb insert_cb, search_key_cb search_cb) +{ FILE *file = fopen(fileName, "r"); if (file == NULL) { LOG_ERROR("File not available: %s\n", fileName); exit(4); } - int max_line_len = 512; - char *line = malloc(2 * max_line_len); - char *word = malloc(max_line_len); + int max_line_len = 512; + char *line = malloc(2 * max_line_len); + char *word = malloc(max_line_len); if (!line || !word) { LOG_ERROR("Memory allocation failed\n"); @@ -354,8 +356,9 @@ char **read_words_from_text(const char *fileName, int *word_count, int **req_cou if (strchr(line, '\n') == NULL && !feof(file)) { LOG_ERROR("Input line too long at line %d, skipping.\n", line_count + 1); int ch; - while ((ch = fgetc(file)) != '\n' && ch != EOF); - continue; + while ((ch = fgetc(file)) != '\n' && ch != EOF) + ; + continue; } int rc; diff --git a/src/tests/dart_test.c b/src/tests/dart_test.c index 27aaaacf8..47188a49d 100644 --- a/src/tests/dart_test.c +++ b/src/tests/dart_test.c @@ -54,7 +54,7 @@ char ** read_words_from_text(const char *fileName, int *word_count, int *total_word_count, int mpi_rank) { - FILE *file = fopen(fileName, "r"); + FILE *file = fopen(fileName, "r"); if (file == NULL) { LOG_ERROR("File not available\n"); exit(4); From 5bd953075703065d3f050dfc8485b7fc2bdf80ab Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 13:22:10 -0700 Subject: [PATCH 20/43] another --- src/tests/dart_algo_sim.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/dart_algo_sim.c b/src/tests/dart_algo_sim.c index ef68cf220..acb28cd0f 100644 --- a/src/tests/dart_algo_sim.c +++ b/src/tests/dart_algo_sim.c @@ -329,7 +329,7 @@ char **read_words_from_text(const char *fileName, int *word_count, int **req_cou insert_key_cb insert_cb, search_key_cb search_cb) { FILE *file = fopen(fileName, "r"); if (file == NULL) { - LOG_ERROR("File not available: %s\n", fileName); + fprintf(stderr, "File not available: %s\n", fileName); exit(4); } @@ -338,7 +338,7 @@ char **read_words_from_text(const char *fileName, int *word_count, int **req_cou char *word = malloc(max_line_len); if (!line || !word) { - LOG_ERROR("Memory allocation failed\n"); + fprintf(stderr, "Memory allocation failed\n"); fclose(file); exit(1); } @@ -352,15 +352,15 @@ char **read_words_from_text(const char *fileName, int *word_count, int **req_cou } if (strchr(line, '\n') == NULL && !feof(file)) { - LOG_ERROR("Input line too long at line %d, skipping.\n", line_count + 1); + fprintf(stderr, "Input line too long at line %d, skipping.\n", line_count + 1); int ch; while ((ch = fgetc(file)) != '\n' && ch != EOF); - continue; + continue; } int rc; if (sscanf(line, "%d %511s", &rc, word) != 2) { - LOG_ERROR("Malformed line at line %d: '%s'\n", line_count + 1, line); + fprintf(stderr, "Malformed line at line %d: '%s'\n", line_count + 1, line); continue; } From 9ba1f23255366b34ffbf09522f038d2a7704f306 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Apr 2025 20:23:06 +0000 Subject: [PATCH 21/43] Committing clang-format changes --- src/tests/dart_algo_sim.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests/dart_algo_sim.c b/src/tests/dart_algo_sim.c index 690c7a9ee..3ddd62523 100644 --- a/src/tests/dart_algo_sim.c +++ b/src/tests/dart_algo_sim.c @@ -356,7 +356,8 @@ read_words_from_text(const char *fileName, int *word_count, int **req_count, int if (strchr(line, '\n') == NULL && !feof(file)) { fprintf(stderr, "Input line too long at line %d, skipping.\n", line_count + 1); int ch; - while ((ch = fgetc(file)) != '\n' && ch != EOF); + while ((ch = fgetc(file)) != '\n' && ch != EOF) + ; continue; } From f0a3c22de085a26fd8f24da196c307fc22770c7d Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 13:29:31 -0700 Subject: [PATCH 22/43] another --- src/api/pdc_client_connect.c | 2 +- src/server/pdc_client_server_common.c | 4 ++-- src/tests/llsm_idioms_bench.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index 5c40c0e9f..ca151e3ab 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -1380,7 +1380,7 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po } memset(hostname, 0, sizeof(hostname)); gethostname(hostname, sizeof(hostname)); - sprintf(na_info_string, "%s://%s:%d", hg_transport, hostname, port); + snprintf(na_info_string, sizeof(na_info_string), "%s://%s:%d", hg_transport, hostname, port); if (pdc_client_mpi_rank_g == 0) { LOG_INFO("==PDC_CLIENT: using %.7s\n", na_info_string); fflush(stdout); diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index b9fc8cea3..4843e6bba 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -4760,7 +4760,7 @@ PDC_find_in_path(char *workingDir, char *application) while (next) { *next++ = 0; - sprintf(checkPath, "%s/%s", pathVar, application); + snprintf(checkPath, sizeof(checkPath), "%s/%s", pathVar, application); if (stat(checkPath, &fileStat) == 0) { PGOTO_DONE(strdup(checkPath)); } @@ -4768,7 +4768,7 @@ PDC_find_in_path(char *workingDir, char *application) next = strchr(pathVar, colon); } if (application[0] == '.') { - sprintf(checkPath, "%s/%s", workingDir, application); + snprintf(checkPath, sizeof(checkPath), "%s/%s", workingDir, application); if (stat(checkPath, &fileStat) == 0) { char *foundPath = strrchr(checkPath, '/'); char *appName = foundPath + 1; diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/llsm_idioms_bench.c index d7c4d7200..7ff4c7667 100644 --- a/src/tests/llsm_idioms_bench.c +++ b/src/tests/llsm_idioms_bench.c @@ -243,7 +243,7 @@ csv_tags_on_objects(pdcid_t *obj_ids, char ***csv_data, char **csv_header, int n char new_iter_value[30]; sprintf(new_iter_value, "Scan_Iter_%04d", j); char new_iter_tok[10]; - sprintf(new_iter_tok, "%04dt.tif", j); + snprintf(new_iter_tok, sizeof(new_iter_tok), "%04dt.tif", j); char extra_attr_name[100]; char extra_attr_value[200]; From 3a7453e0b7ea07d54395547fa632a1af463974b1 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Tue, 22 Apr 2025 13:42:09 -0700 Subject: [PATCH 23/43] another --- src/server/pdc_client_server_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index 4843e6bba..80e8b136c 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -4737,7 +4737,7 @@ remove_relative_dirs(char *workingDir, char *application) k = strlen(workingDir); if ((appName[0] == '.') && (appName[1] == '/')) appName += 2; - sprintf(&workingDir[k], "/%s", appName); + snprintf(&workingDir[k], PATH_MAX, "/%s", appName); ret_value = strdup(workingDir); @@ -4787,7 +4787,7 @@ PDC_find_in_path(char *workingDir, char *application) if (chdir(workingDir) != 0) { LOG_ERROR("Check dir failed\n"); } - sprintf(&checkPath[offset], "/%s", appName); + snprintf(&checkPath[offset], PATH_MAX, "/%s", appName); PGOTO_DONE(strdup(checkPath)); } } From c1fb397afcc1d1456f7aba6edca2be0f69660595 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Wed, 23 Apr 2025 16:36:41 -0700 Subject: [PATCH 24/43] another --- src/tests/dart_attr_dist_test.c | 14 +++++++------- src/tests/dart_test.c | 27 +++++++++++++-------------- src/tests/kvtag_query.c | 2 +- src/tests/llsm_idioms_bench.c | 8 ++++---- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/tests/dart_attr_dist_test.c b/src/tests/dart_attr_dist_test.c index a619d36c8..3f2b0339d 100644 --- a/src/tests/dart_attr_dist_test.c +++ b/src/tests/dart_attr_dist_test.c @@ -212,8 +212,8 @@ main(int argc, char *argv[]) val = i + 23456; pct = 0; int num_obj_per_attr = attr_2_obj_array[i]; - sprintf(key, "k%ld", i + 12345); - sprintf(value, "v%ld", val); + sprintf(key, "k%d", i + 12345); + sprintf(value, "v%d", val); println("attaching attribute #%d [%s:%s] to %d objects", i, key, value, num_obj_per_attr); for (j = 0; j < num_obj_per_attr; j++) { // each attribute is attached to a specific number of objects, and this is how we make up @@ -251,9 +251,9 @@ main(int argc, char *argv[]) dart_hash_algo_t hash_algo = DART_HASH; for (i = 0; i < arr_len; i++) { - sprintf(key, "k%ld", i + 12345); + sprintf(key, "k%d", i + 12345); val = i + 23456; - sprintf(value, "v%ld", val); + sprintf(value, "v%d", val); pct = 0; for (j = 0; j < attr_2_obj_array[i]; j++) { if (j % size == rank) { @@ -295,7 +295,7 @@ main(int argc, char *argv[]) int rest_count1 = 0; timer_start(&timer_obj); for (k = 0; k < q_repeat_count; k++) { - sprintf(key, "k%ld", i + 12345); + sprintf(key, "k%d", i + 12345); val = i + 23456; kvtag.name = key; @@ -335,8 +335,8 @@ main(int argc, char *argv[]) int rest_count1 = 0; timer_start(&timer_dart); for (k = 0; k < q_repeat_count; k++) { - sprintf(key, "k%ld", i + 12345); - sprintf(value, "v%ld", i + 23456); + sprintf(key, "k%d", i + 12345); + sprintf(value, "v%d", i + 23456); sprintf(exact_query, "%s=%s", key, value); // DART query methods diff --git a/src/tests/dart_test.c b/src/tests/dart_test.c index 47188a49d..660e99b36 100644 --- a/src/tests/dart_test.c +++ b/src/tests/dart_test.c @@ -238,7 +238,7 @@ main(int argc, char **argv) timer_pause(&detailed_timer); if (round == 1) println("[Client_Side_Insert] Time to insert key %s for both prefix index and suffix index = " - "%d microseconds", + "%f microseconds", input_word_list[i], timer_delta_us(&detailed_timer)); } @@ -296,7 +296,7 @@ main(int argc, char **argv) PDC_Client_search_obj_ref_through_dart(hash_algo, query_str, ref_type, &rest_count, &out); timer_pause(&detailed_timer); if (round == 1) - println("[Client_Side_Exact] Time to search '%s' and get %d results = %d microseconds for " + println("[Client_Side_Exact] Time to search '%s' and get %d results = %f microseconds for " "rank %d", query_str, rest_count, timer_delta_us(&detailed_timer), rank); } @@ -318,7 +318,7 @@ main(int argc, char **argv) server_abstract.id = srv_cnt; dart_retrieve_server_info_cb(&server_abstract); if (round == 1) - println("[DART Load Balance 1] Server %d has query requests = %d", srv_cnt, + println("[DART Load Balance 1] Server %d has query requests = %" PRId64, srv_cnt, server_abstract.request_count); } } @@ -349,7 +349,7 @@ main(int argc, char **argv) PDC_Client_search_obj_ref_through_dart(hash_algo, query_str, ref_type, &rest_count, &out); timer_pause(&detailed_timer); if (round == 1) - println("[Client_Side_Prefix] Time to search '%s' and get %d results = %d microseconds for " + println("[Client_Side_Prefix] Time to search '%s' and get %d results = %f microseconds for " "rank %d", query_str, rest_count, timer_delta_us(&detailed_timer), rank); } @@ -371,7 +371,7 @@ main(int argc, char **argv) server_abstract.id = srv_cnt; dart_retrieve_server_info_cb(&server_abstract); if (round == 1) - println("[DART Load Balance 2] Server %d has query requests = %d", srv_cnt, + println("[DART Load Balance 2] Server %d has query requests = %" PRId64, srv_cnt, server_abstract.request_count); } } @@ -402,7 +402,7 @@ main(int argc, char **argv) PDC_Client_search_obj_ref_through_dart(hash_algo, query_str, ref_type, &rest_count, &out); timer_pause(&detailed_timer); if (round == 1) - println("[Client_Side_Suffix] Time to search '%s' and get %d results = %d microseconds for " + println("[Client_Side_Suffix] Time to search '%s' and get %d results = %f microseconds for " "rank %d", query_str, rest_count, timer_delta_us(&detailed_timer), rank); } @@ -424,7 +424,7 @@ main(int argc, char **argv) server_abstract.id = srv_cnt; dart_retrieve_server_info_cb(&server_abstract); if (round == 1) - println("[DART Load Balance 3] Server %d has query requests = %d", srv_cnt, + println("[DART Load Balance 3] Server %d has query requests = %" PRId64, srv_cnt, server_abstract.request_count); } } @@ -458,7 +458,7 @@ main(int argc, char **argv) PDC_Client_search_obj_ref_through_dart(hash_algo, query_str, ref_type, &rest_count, &out); timer_pause(&detailed_timer); if (round == 1) - println("[Client_Side_Infix] Time to search '%s' and get %d results = %d microseconds for " + println("[Client_Side_Infix] Time to search '%s' and get %d results = %f microseconds for " "rank %d", query_str, rest_count, timer_delta_us(&detailed_timer), rank); } @@ -480,7 +480,7 @@ main(int argc, char **argv) server_abstract.id = srv_cnt; dart_retrieve_server_info_cb(&server_abstract); if (round == 1) - println("[DART Load Balance 4] Server %d has query requests = %d", srv_cnt, + println("[DART Load Balance 4] Server %d has query requests = %" PRId64, srv_cnt, server_abstract.request_count); } } @@ -499,7 +499,7 @@ main(int argc, char **argv) dart_retrieve_server_info_cb(&server_abstract); int64_t num_request = server_abstract.request_count; if (round == 1) - println("[DART Load Balance All] The total number of query requests on server %d = %d", + println("[DART Load Balance All] The total number of query requests on server %d = %" PRId64, srv_cnt, num_request); sum += (double)num_request; sqrt_sum += (double)((double)num_request * (double)num_request); @@ -528,8 +528,7 @@ main(int argc, char **argv) dart_retrieve_server_info_cb(&server_abstract); int64_t num_indexed_word = server_abstract.indexed_word_count / 2; if (round == 1) - println("[DART Key Distribution] Server %d has %d words indexed", srv_cnt, - num_indexed_word); + println("[DART Key Distribution] Server %d has %" PRIu64 " words indexed", srv_cnt, num_indexed_word); sum += (double)num_indexed_word; sqrt_sum += (double)((double)num_indexed_word * (double)num_indexed_word); } @@ -562,8 +561,8 @@ main(int argc, char **argv) (uint64_t)data); timer_pause(&detailed_timer); if (round == 1) - println("[Client_Side_Delete] Time to delete key %s for both prefix index and suffix index = " - "%d microseconds", + println("[Client_Side_Delete] Time to delete key % for both prefix index and suffix index = " + "%f microseconds", input_word_list[i], timer_delta_us(&detailed_timer)); } diff --git a/src/tests/kvtag_query.c b/src/tests/kvtag_query.c index 3f11bae79..807f8cb07 100644 --- a/src/tests/kvtag_query.c +++ b/src/tests/kvtag_query.c @@ -196,7 +196,7 @@ main(int argc, char *argv[]) for (iter = 0; iter < round; iter++) { v = iter; if (is_using_dart) { - sprintf(value, "%ld", v); + sprintf(value, "%d", v); sprintf(exact_query, "%s=%s", kvtag.name, value); #ifdef ENABLE_MPI PDC_Client_search_obj_ref_through_dart_mpi(hash_algo, exact_query, ref_type, &nres, &pdc_ids, diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/llsm_idioms_bench.c index 7ff4c7667..e90ee73de 100644 --- a/src/tests/llsm_idioms_bench.c +++ b/src/tests/llsm_idioms_bench.c @@ -105,7 +105,7 @@ create_objects(pdcid_t **obj_ids, int my_csv_rows, int csv_expand_factor, pdcid_ for (int i = 0; i < my_csv_rows; i++) { // create `csv_expansion_factor` data objects for each csv row. for (int obj_idx = 0; obj_idx < csv_expand_factor; obj_idx++) { - sprintf(obj_name, "obj%" PRId64 "%d", timestamp, obj_created); + sprintf(obj_name, "obj%" PRId64 "%zu", timestamp, obj_created); pdcid_t obj_id = PDCobj_create(cont, obj_name, obj_prop); (*obj_ids)[obj_created] = obj_id; @@ -484,7 +484,7 @@ main(int argc, char *argv[]) #endif if (my_rank == 0) { - println("[Object Creation] Rank %d/%d: Created %d objects, time: %.5f ms", my_rank, proc_num, + println("[Object Creation] Rank %d/%d: Created %zu objects, time: %.5f ms", my_rank, proc_num, obj_created, total_time * 1000.0); } @@ -504,7 +504,7 @@ main(int argc, char *argv[]) #endif if (my_rank == 0) { - println("[Tag Creation] Rank %d/%d: Added %d tags for %d objects, time: %.5f ms", my_rank, proc_num, + println("[Tag Creation] Rank %d/%d: Added %zu tags for %zu objects, time: %.5f ms", my_rank, proc_num, tags_added, obj_created, total_time * 1000.0); } @@ -579,7 +579,7 @@ main(int argc, char *argv[]) #endif if (my_rank == 0) { - println("[TAG Deletion] Rank %d/%d: Deleted %d kvtag from %d objects, time: %.5f ms", my_rank, + println("[TAG Deletion] Rank %d/%d: Deleted %zu kvtag from %zu objects, time: %.5f ms", my_rank, proc_num, tags_deleted, obj_created, total_time * 1000.0); } From 1cf5d30b842cab0e6d7444a76256eeda6461ca89 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Apr 2025 23:37:05 +0000 Subject: [PATCH 25/43] Committing clang-format changes --- src/tests/dart_test.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tests/dart_test.c b/src/tests/dart_test.c index 660e99b36..1e59aab42 100644 --- a/src/tests/dart_test.c +++ b/src/tests/dart_test.c @@ -499,8 +499,9 @@ main(int argc, char **argv) dart_retrieve_server_info_cb(&server_abstract); int64_t num_request = server_abstract.request_count; if (round == 1) - println("[DART Load Balance All] The total number of query requests on server %d = %" PRId64, - srv_cnt, num_request); + println( + "[DART Load Balance All] The total number of query requests on server %d = %" PRId64, + srv_cnt, num_request); sum += (double)num_request; sqrt_sum += (double)((double)num_request * (double)num_request); } @@ -528,7 +529,8 @@ main(int argc, char **argv) dart_retrieve_server_info_cb(&server_abstract); int64_t num_indexed_word = server_abstract.indexed_word_count / 2; if (round == 1) - println("[DART Key Distribution] Server %d has %" PRIu64 " words indexed", srv_cnt, num_indexed_word); + println("[DART Key Distribution] Server %d has %" PRIu64 " words indexed", srv_cnt, + num_indexed_word); sum += (double)num_indexed_word; sqrt_sum += (double)((double)num_indexed_word * (double)num_indexed_word); } From 1da939af0314d64ade1e7c5c8643ee70eec6dca6 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Wed, 23 Apr 2025 17:02:27 -0700 Subject: [PATCH 26/43] another --- examples/read_write_col_perf.c | 4 +- src/commons/collections/libhl/rbtree.c | 48 ++----------------- .../dart/index/idioms/idioms_local_index.c | 2 +- .../pdc_server_region/pdc_server_data.c | 8 ++-- src/tests/dart_test.c | 2 +- src/tests/read_write_col_perf.c | 8 ++-- 6 files changed, 17 insertions(+), 55 deletions(-) diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c index 7aa15998a..aa250d0e0 100644 --- a/examples/read_write_col_perf.c +++ b/examples/read_write_col_perf.c @@ -79,12 +79,12 @@ main(int argc, char **argv) local_offset[0] = 0; data_size_array[0] = atoi(argv[2]); if (ndim == 1) { - offset[0] = rank * data_size_array[0] * 1048576; + offset[0] = (uint64_t)rank * (uint64_t)data_size_array[0] * 1048576; offset_length[0] = data_size_array[0] * 1048576; data_size = data_size_array[0] * 1048576; } else { - offset[0] = rank * data_size_array[0]; + offset[0] = (uint64_t)rank * (uint64_t)data_size_array[0]; offset_length[0] = data_size_array[0]; data_size = data_size_array[0]; } diff --git a/src/commons/collections/libhl/rbtree.c b/src/commons/collections/libhl/rbtree.c index 14ad28302..acb2d1433 100644 --- a/src/commons/collections/libhl/rbtree.c +++ b/src/commons/collections/libhl/rbtree.c @@ -851,7 +851,7 @@ rbt_remove(rbt_t *rbt, void *k, size_t klen, void **v) else { (*n)->parent->right = (*n)->left; } - if (n && *n && (*n)->left) { + if ((*n)->left) { (*n)->left->parent = *node; } } @@ -862,26 +862,13 @@ rbt_remove(rbt_t *rbt, void *k, size_t klen, void **v) else { (*n)->parent->left = (*n)->right; } - if (n && *n && (*n)->right) { + if ((*n)->right) { (*n)->right->parent = *node; } } - if (n && *n) { - rbt_free_node(rbt, n, &prev_value, v); - } + rbt_free_node(rbt, n, &prev_value, v); - // free((*n)->key); - // (*n)->key = NULL; - // if (v) - // *v = prev_value; - // else if (rbt->free_value_cb) { - // rbt->free_value_cb(prev_value); - // (&prev_value)[0] = NULL; - // } - - // free((*n)); - // *n = NULL; rbt->size = rbt->size - 1; return 0; } @@ -905,21 +892,8 @@ rbt_remove(rbt_t *rbt, void *k, size_t klen, void **v) } } - if (node && *node) { - rbt_free_node(rbt, node, &((*node)->value), v); - } + rbt_free_node(rbt, node, &((*node)->value), v); - // if (v) - // *v = (*node)->value; - // else if (rbt->free_value_cb) { - // rbt->free_value_cb((*node)->value); - // (*node)->value = NULL; - // } - - // free((*node)->key); - // (*node)->key = NULL; - // free((*node)); - // *node = NULL; rbt->size = rbt->size - 1; return 0; } @@ -933,20 +907,8 @@ rbt_remove(rbt_t *rbt, void *k, size_t klen, void **v) (*node)->parent->right = NULL; } - if (node && *node) { - rbt_free_node(rbt, node, &((*node)->value), v); - } - // if (v) - // *v = (*node)->value; - // else if (rbt->free_value_cb && (*node)->value) { - // rbt->free_value_cb((*node)->value); - // (*node)->value = NULL; - // } + rbt_free_node(rbt, node, &((*node)->value), v); - // free(node->key); - // node->key = NULL; - // // free(node); - // // (&node)[0] = NULL; rbt->size = rbt->size - 1; return 0; } diff --git a/src/commons/index/dart/index/idioms/idioms_local_index.c b/src/commons/index/dart/index/idioms/idioms_local_index.c index 16c0d31eb..6088a3b88 100644 --- a/src/commons/index/dart/index/idioms/idioms_local_index.c +++ b/src/commons/index/dart/index/idioms/idioms_local_index.c @@ -236,7 +236,7 @@ idioms_local_index_create(IDIOMS_t *idioms, IDIOMS_md_idx_record_t *idx_record) idioms->server_id_g, key, idx_record->value, timer_delta_us(&index_timer)); char value_str[64]; if (idx_record->type == PDC_STRING) { - snprintf(value_str, 64, "%s", idx_record->value); + snprintf(value_str, 64, "%s", (char*)(idx_record->value)); } else if (is_PDC_UINT(idx_record->type)) { snprintf(value_str, 64, "%" PRIu64, *((uint64_t *)idx_record->value)); diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 674960932..88748f543 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -2445,7 +2445,7 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) // equivalent to storage metadadata searching if (server_id == (uint32_t)pdc_server_rank_g) { send_buf = (update_region_storage_meta_bulk_t *)calloc(sizeof(update_region_storage_meta_bulk_t), - pdc_server_size_g * nrequest_per_server * + (size_t)pdc_server_size_g * (size_t)nrequest_per_server * PDC_MAX_OVERLAP_REGION_NUM); // All participants are querying the same object, so obj_ids are the same @@ -8198,15 +8198,15 @@ perr_t add_storage_region_to_buf(void **in_buf, uint64_t *buf_alloc, uint64_t *buf_off, const region_list_t *region) { perr_t ret_value = SUCCEED; - void * buf = *in_buf; uint64_t my_size, tmp_size; if (in_buf == NULL || *in_buf == NULL || region == NULL || buf_alloc == NULL || buf_off == NULL || region->storage_location[0] == '\0') { - LOG_ERROR("==PDC_SERVER[%d]: ERROR! NULL input!\n", pdc_server_rank_g); - goto done; + PGOTO_ERROR(FAIL, "==PDC_SERVER[%d]: ERROR! NULL input!\n", pdc_server_rank_g); } + void * buf = *in_buf; + my_size = 4 + strlen(region->storage_location) + 1 + sizeof(region_info_transfer_t) + 20; if (region->region_hist != NULL) { my_size += (8 * (region->region_hist->nbin) * 3); diff --git a/src/tests/dart_test.c b/src/tests/dart_test.c index 660e99b36..18c8cfca3 100644 --- a/src/tests/dart_test.c +++ b/src/tests/dart_test.c @@ -561,7 +561,7 @@ main(int argc, char **argv) (uint64_t)data); timer_pause(&detailed_timer); if (round == 1) - println("[Client_Side_Delete] Time to delete key % for both prefix index and suffix index = " + println("[Client_Side_Delete] Time to delete key %s for both prefix index and suffix index = " "%f microseconds", input_word_list[i], timer_delta_us(&detailed_timer)); } diff --git a/src/tests/read_write_col_perf.c b/src/tests/read_write_col_perf.c index d9d0d0ee1..0f0c51f37 100644 --- a/src/tests/read_write_col_perf.c +++ b/src/tests/read_write_col_perf.c @@ -86,7 +86,7 @@ main(int argc, char **argv) data_size = data_size_array[0] * 1048576; } else { - offset[0] = rank * data_size_array[0]; + offset[0] = (uint64_t)rank * (uint64_t)data_size_array[0]; offset_length[0] = data_size_array[0]; data_size = data_size_array[0]; } @@ -95,7 +95,7 @@ main(int argc, char **argv) local_offset[1] = 0; offset[1] = 0; data_size_array[1] = atoi(argv[3]); - offset_length[1] = data_size_array[1] * 1048576; + offset_length[1] =(uint64_t) data_size_array[1] * 1048576; data_size *= offset_length[1]; dims[1] = offset_length[1]; } @@ -108,14 +108,14 @@ main(int argc, char **argv) local_offset[2] = 0; offset[2] = 0; data_size_array[2] = atoi(argv[4]); - offset_length[2] = data_size_array[2] * 1048576; + offset_length[2] = (uint64_t)data_size_array[2] * 1048576; data_size *= offset_length[2] * offset_length[1]; dims[1] = offset_length[1]; dims[2] = offset_length[2]; } n_objects = atoi(argv[1]); - int *data = (int *)malloc(sizeof(int) * data_size); + int *data = (int *)malloc(sizeof(int) * (size_t)data_size); char hostname[256]; gethostname(hostname, 256); From 30b8afd4dea308a94d58113b15d2c4d62b7f8bfb Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 24 Apr 2025 00:02:58 +0000 Subject: [PATCH 27/43] Committing clang-format changes --- src/commons/index/dart/index/idioms/idioms_local_index.c | 2 +- src/server/pdc_server_region/pdc_server_data.c | 8 ++++---- src/tests/read_write_col_perf.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/commons/index/dart/index/idioms/idioms_local_index.c b/src/commons/index/dart/index/idioms/idioms_local_index.c index 6088a3b88..8e780d46a 100644 --- a/src/commons/index/dart/index/idioms/idioms_local_index.c +++ b/src/commons/index/dart/index/idioms/idioms_local_index.c @@ -236,7 +236,7 @@ idioms_local_index_create(IDIOMS_t *idioms, IDIOMS_md_idx_record_t *idx_record) idioms->server_id_g, key, idx_record->value, timer_delta_us(&index_timer)); char value_str[64]; if (idx_record->type == PDC_STRING) { - snprintf(value_str, 64, "%s", (char*)(idx_record->value)); + snprintf(value_str, 64, "%s", (char *)(idx_record->value)); } else if (is_PDC_UINT(idx_record->type)) { snprintf(value_str, 64, "%" PRIu64, *((uint64_t *)idx_record->value)); diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 88748f543..ae7d96a01 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -2444,9 +2444,9 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) // Now server_id has all the data in all_requests, find all storage regions that overlaps with it // equivalent to storage metadadata searching if (server_id == (uint32_t)pdc_server_rank_g) { - send_buf = (update_region_storage_meta_bulk_t *)calloc(sizeof(update_region_storage_meta_bulk_t), - (size_t)pdc_server_size_g * (size_t)nrequest_per_server * - PDC_MAX_OVERLAP_REGION_NUM); + send_buf = (update_region_storage_meta_bulk_t *)calloc( + sizeof(update_region_storage_meta_bulk_t), + (size_t)pdc_server_size_g * (size_t)nrequest_per_server * PDC_MAX_OVERLAP_REGION_NUM); // All participants are querying the same object, so obj_ids are the same // Search one by one @@ -8205,7 +8205,7 @@ add_storage_region_to_buf(void **in_buf, uint64_t *buf_alloc, uint64_t *buf_off, PGOTO_ERROR(FAIL, "==PDC_SERVER[%d]: ERROR! NULL input!\n", pdc_server_rank_g); } - void * buf = *in_buf; + void *buf = *in_buf; my_size = 4 + strlen(region->storage_location) + 1 + sizeof(region_info_transfer_t) + 20; if (region->region_hist != NULL) { diff --git a/src/tests/read_write_col_perf.c b/src/tests/read_write_col_perf.c index 0f0c51f37..db16996ae 100644 --- a/src/tests/read_write_col_perf.c +++ b/src/tests/read_write_col_perf.c @@ -95,7 +95,7 @@ main(int argc, char **argv) local_offset[1] = 0; offset[1] = 0; data_size_array[1] = atoi(argv[3]); - offset_length[1] =(uint64_t) data_size_array[1] * 1048576; + offset_length[1] = (uint64_t)data_size_array[1] * 1048576; data_size *= offset_length[1]; dims[1] = offset_length[1]; } From 0b3fd04d592048a10e0b8c86e9cecfc8517ac384 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Thu, 24 Apr 2025 05:31:36 -0700 Subject: [PATCH 28/43] another --- src/api/pdc_client_connect.c | 2 +- src/commons/index/dart/dart_core.c | 3 +- .../dart/index/idioms/idioms_persistence.c | 4 - src/commons/utils/string_utils.c | 4 +- src/server/pdc_client_server_common.c | 12 +- src/tests/dart_algo_sim.c | 4 +- src/tests/llsm_idioms_bench.c | 2 +- src/tests/query_data.c | 2 +- src/tests/read_write_col_perf.c | 113 ++++++++++-------- 9 files changed, 72 insertions(+), 74 deletions(-) diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index ca151e3ab..36a42451a 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -6593,7 +6593,7 @@ PDC_Client_query_multi_storage_info(int nobj, char **obj_names, region_storage_m obj_names_by_server = (char ***)calloc(sizeof(char **), pdc_server_num_g); n_obj_name_by_server = (int *)calloc(sizeof(int), pdc_server_num_g); obj_names_server_seq_mapping = (int **)calloc(sizeof(int *), pdc_server_num_g); - obj_names_server_seq_mapping_1d = (int *)calloc(sizeof(int), nobj * pdc_server_num_g); + obj_names_server_seq_mapping_1d = (int *)calloc(sizeof(int), (size_t)nobj * (size_t)pdc_server_num_g); for (i = 0; i < pdc_server_num_g; i++) { obj_names_by_server[i] = (char **)calloc(sizeof(char *), nobj); obj_names_server_seq_mapping[i] = obj_names_server_seq_mapping_1d + i * nobj; diff --git a/src/commons/index/dart/dart_core.c b/src/commons/index/dart/dart_core.c index 9c54a5ba4..2a09078ee 100644 --- a/src/commons/index/dart/dart_core.c +++ b/src/commons/index/dart/dart_core.c @@ -274,8 +274,7 @@ get_reconciled_vnode_id_with_power_of_two_choice_rehashing_2(DART *dart, uint64_ int ir_idx = (int)ceil((double)(dart->alphabet_size / 2)); // We also calculate the region start position. - uint64_t region_start = ((((int)word[0] + ir_idx) % dart->alphabet_size)) * - region_size; // ((reconciled_vnode_idx)/region_size) * (region_size); + uint64_t region_start = (((uint64_t)word[0] + (uint64_t)ir_idx) % (uint64_t)(dart->alphabet_size)) * (uint64_t)region_size; // Finally, the reconciled vnode index is calculated. // reconciled_vnode_idx = (0 + region_start + region_offset) % dart->num_vnode; reconciled_vnode_idx = (reconciled_vnode_idx + region_start + region_offset) % dart->num_vnode; diff --git a/src/commons/index/dart/index/idioms/idioms_persistence.c b/src/commons/index/dart/index/idioms/idioms_persistence.c index e1a00f1f8..a7e012825 100644 --- a/src/commons/index/dart/index/idioms/idioms_persistence.c +++ b/src/commons/index/dart/index/idioms/idioms_persistence.c @@ -355,10 +355,6 @@ read_attr_name_node(IDIOMS_t *idioms, char *dir_path, char *base_name, uint32_t char file_name[1024]; sprintf(file_name, "%s/%s_%" PRIu32 "_%" PRIu64 ".bin", dir_path, base_name, serverID, vnode_id); - // check file existence - if (access(file_name, F_OK) == -1) { - return FAIL; - } FILE *stream = fopen(file_name, "rb"); if (stream == NULL) { return FAIL; diff --git a/src/commons/utils/string_utils.c b/src/commons/utils/string_utils.c index aa810d3b7..f1101c50a 100644 --- a/src/commons/utils/string_utils.c +++ b/src/commons/utils/string_utils.c @@ -318,9 +318,7 @@ gen_random_strings(int count, int minlen, int maxlen, int alphabet_size) len = len < minlen ? minlen : len; // Ensure at least minlen character char *str = (char *)calloc(len + 1, sizeof(char)); for (i = 0; i < len; i++) { - int randnum = rand(); - if (randnum < 0) - randnum *= -1; + unsigned int randnum = (unsigned int)rand(); char chr = VISIBLE_ALPHABET[randnum % abc_size]; str[i] = chr; } diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index 80e8b136c..6e348ece2 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -2681,24 +2681,22 @@ HG_TEST_RPC_CB(region_release, handle) region_lock_in_t in; region_lock_out_t out; const struct hg_info * hg_info = NULL; - data_server_region_t * target_obj; + data_server_region_t * target_obj = NULL; int error = 0; int dirty_reg = 0; hg_size_t size, size2; void * data_buf; struct pdc_region_info * server_region; - region_list_t * elt, *request_region, *tmp, *elt_tmp; + region_list_t * elt = NULL, *request_region = NULL, *tmp = NULL, *elt_tmp = NULL; struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; struct buf_map_release_bulk_args * buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info * remote_reg_info; - region_buf_map_t * eltt, *eltt2, *eltt_tmp; - hg_uint32_t /*k, m, */ remote_count; + struct pdc_region_info * remote_reg_info = NULL; + region_buf_map_t * eltt = NULL, *eltt2 = NULL, *eltt_tmp = NULL; + hg_uint32_t remote_count; void ** data_ptrs_to = NULL; size_t * data_size_to = NULL; - // size_t type_size = 0; - // size_t dims[4] = {0, 0, 0, 0}; #ifdef PDC_TIMING double start, end; #endif diff --git a/src/tests/dart_algo_sim.c b/src/tests/dart_algo_sim.c index 3ddd62523..3459b5430 100644 --- a/src/tests/dart_algo_sim.c +++ b/src/tests/dart_algo_sim.c @@ -306,9 +306,7 @@ gen_random_strings_with_cb(int count, int minlen, int maxlen, int alphabet_size, len = len < minlen ? minlen : len; char *str = (char *)calloc(len + 1, sizeof(len)); for (i = 0; i < len; i++) { - int randnum = rand(); - if (randnum < 0) - randnum *= -1; + unsigned int randnum = (unsigned int)rand(); char chr = (char)((randnum % alphabet_size) + 65); str[i] = chr; } diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/llsm_idioms_bench.c index e90ee73de..bfbfebada 100644 --- a/src/tests/llsm_idioms_bench.c +++ b/src/tests/llsm_idioms_bench.c @@ -101,7 +101,7 @@ create_objects(pdcid_t **obj_ids, int my_csv_rows, int csv_expand_factor, pdcid_ char obj_name[128]; int64_t timestamp = get_timestamp_us(); - *obj_ids = (pdcid_t *)calloc(my_csv_rows * csv_expand_factor, sizeof(pdcid_t)); + *obj_ids = (pdcid_t *)calloc((size_t)my_csv_rows * (size_t)csv_expand_factor, sizeof(pdcid_t)); for (int i = 0; i < my_csv_rows; i++) { // create `csv_expansion_factor` data objects for each csv row. for (int obj_idx = 0; obj_idx < csv_expand_factor; obj_idx++) { diff --git a/src/tests/query_data.c b/src/tests/query_data.c index 22db011a7..01e9f05cf 100644 --- a/src/tests/query_data.c +++ b/src/tests/query_data.c @@ -119,7 +119,7 @@ main(int argc, char **argv) region.ndim = ndim; region.offset = (uint64_t *)malloc(sizeof(uint64_t) * ndim); region.size = (uint64_t *)malloc(sizeof(uint64_t) * ndim); - region.offset[0] = rank * my_data_count; + region.offset[0] = (uint64_t)rank * my_data_count; region.size[0] = my_data_count; mydata = (int *)malloc(my_data_count); diff --git a/src/tests/read_write_col_perf.c b/src/tests/read_write_col_perf.c index 0f0c51f37..d37d8f8da 100644 --- a/src/tests/read_write_col_perf.c +++ b/src/tests/read_write_col_perf.c @@ -36,6 +36,8 @@ #include "pdc_timing.h" #define BUF_LEN 128 +#define MAX_DATA_SIZE 1000000 +#define GOTO_DONE_ERROR() ret_value = 1; goto done; int main(int argc, char **argv) @@ -75,13 +77,13 @@ main(int argc, char **argv) ndim = 3; } else { - LOG_JUST_PRINT("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3"); + LOG_JUST_PRINT("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3\n"); } local_offset[0] = 0; data_size_array[0] = atoi(argv[2]); if (ndim == 1) { - offset[0] = rank * data_size_array[0] * 1048576; + offset[0] = (uint64_t)rank * (uint64_t)data_size_array[0] * 1048576; offset_length[0] = data_size_array[0] * 1048576; data_size = data_size_array[0] * 1048576; } @@ -115,6 +117,11 @@ main(int argc, char **argv) dims[2] = offset_length[2]; } n_objects = atoi(argv[1]); + + if(data_size > MAX_DATA_SIZE) { + GOTO_DONE_ERROR(); + } + int *data = (int *)malloc(sizeof(int) * (size_t)data_size); char hostname[256]; @@ -138,27 +145,27 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Failed to create container property"); - ret_value = 1; + LOG_ERROR("Failed to create container property\n"); + GOTO_DONE_ERROR(); } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Failed to create container"); - ret_value = 1; + LOG_ERROR("Failed to create container\n"); + GOTO_DONE_ERROR(); } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Failed to create object property"); - ret_value = 1; + LOG_ERROR("Failed to create object property\n"); + GOTO_DONE_ERROR(); } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Failed to set obj type"); - ret_value = 1; + LOG_ERROR("Failed to set obj type\n"); + GOTO_DONE_ERROR(); } PDCprop_set_obj_dims(obj_prop, ndim, dims); PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -180,8 +187,8 @@ main(int argc, char **argv) obj1 = PDCobj_create(cont, obj_name1, obj_prop); #endif if (obj1 <= 0) { - LOG_ERROR("Failed to create object"); - ret_value = 1; + LOG_ERROR("Failed to create object\n"); + GOTO_DONE_ERROR(); } reg = PDCregion_create(ndim, local_offset, offset_length); reg_global = PDCregion_create(ndim, offset, offset_length); @@ -190,45 +197,45 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_WRITE, obj1, reg, reg_global); if (transfer_request == 0) { - LOG_INFO("PDCregion_transfer_create failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_create failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); ret = PDCregion_transfer_start(transfer_request); write_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_start failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_start failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); ret = PDCregion_transfer_wait(transfer_request); write_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_wait failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_wait failed\n"); + GOTO_DONE_ERROR(); } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_close failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_close failed\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Failed to close local region"); - ret_value = 1; + LOG_ERROR("Failed to close local region\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Failed to close global region"); - ret_value = 1; + LOG_ERROR("Failed to close global region\n"); + GOTO_DONE_ERROR(); } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Failed to close object o1"); - ret_value = 1; + LOG_ERROR("Failed to close object o1\n"); + GOTO_DONE_ERROR(); } } #ifdef PDC_TIMING @@ -238,8 +245,8 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_ERROR("Failed to open object"); - ret_value = 1; + LOG_ERROR("Failed to open object\n"); + GOTO_DONE_ERROR(); } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -250,8 +257,8 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_READ, obj1, reg, reg_global); if (transfer_request == 0) { - LOG_ERROR("PDCregion_transfer_create failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_create failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -259,8 +266,8 @@ main(int argc, char **argv) read_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_ERROR("PDCregion_transfer_start failed"); - exit(-1); + LOG_ERROR("PDCregion_transfer_start failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -268,35 +275,35 @@ main(int argc, char **argv) read_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_ERROR("PDCregion_transfer_wait failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_wait failed\n"); + GOTO_DONE_ERROR(); } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("PDCregion_transfer_close failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_close failed\n"); + GOTO_DONE_ERROR(); } if (ret != SUCCEED) { - LOG_ERROR("PDCbuf_obj_unmap failed"); - ret_value = 1; + LOG_ERROR("PDCbuf_obj_unmap failed\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Failed to close local region"); - ret_value = 1; + LOG_ERROR("Failed to close local region\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Failed to close global region"); - ret_value = 1; + LOG_ERROR("Failed to close global region\n"); + GOTO_DONE_ERROR(); } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Failed to close object o1"); - ret_value = 1; + LOG_ERROR("Failed to close object o1\n"); + GOTO_DONE_ERROR(); } } #ifdef PDC_TIMING @@ -304,23 +311,23 @@ main(int argc, char **argv) #endif // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Failed to close container c1"); - ret_value = 1; + LOG_ERROR("Failed to close container c1\n"); + GOTO_DONE_ERROR(); } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Failed to close property"); - ret_value = 1; + LOG_ERROR("Failed to close property\n"); + GOTO_DONE_ERROR(); } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Failed to close property"); - ret_value = 1; + LOG_ERROR("Failed to close property\n"); + GOTO_DONE_ERROR(); } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Failed to close PDC"); - ret_value = 1; + LOG_ERROR("Failed to close PDC\n"); + GOTO_DONE_ERROR(); } #ifdef ENABLE_MPI MPI_Reduce(&write_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); @@ -352,5 +359,7 @@ main(int argc, char **argv) #ifdef ENABLE_MPI MPI_Finalize(); #endif + +done: return ret_value; } From f499edc1cf7c26f45c0d6914f5e7ed698a78306b Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 24 Apr 2025 12:32:10 +0000 Subject: [PATCH 29/43] Committing clang-format changes --- src/commons/index/dart/dart_core.c | 3 ++- src/commons/utils/string_utils.c | 4 ++-- src/server/pdc_client_server_common.c | 8 ++++---- src/tests/dart_algo_sim.c | 4 ++-- src/tests/read_write_col_perf.c | 10 ++++++---- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/commons/index/dart/dart_core.c b/src/commons/index/dart/dart_core.c index 2a09078ee..30b7e06c1 100644 --- a/src/commons/index/dart/dart_core.c +++ b/src/commons/index/dart/dart_core.c @@ -274,7 +274,8 @@ get_reconciled_vnode_id_with_power_of_two_choice_rehashing_2(DART *dart, uint64_ int ir_idx = (int)ceil((double)(dart->alphabet_size / 2)); // We also calculate the region start position. - uint64_t region_start = (((uint64_t)word[0] + (uint64_t)ir_idx) % (uint64_t)(dart->alphabet_size)) * (uint64_t)region_size; + uint64_t region_start = + (((uint64_t)word[0] + (uint64_t)ir_idx) % (uint64_t)(dart->alphabet_size)) * (uint64_t)region_size; // Finally, the reconciled vnode index is calculated. // reconciled_vnode_idx = (0 + region_start + region_offset) % dart->num_vnode; reconciled_vnode_idx = (reconciled_vnode_idx + region_start + region_offset) % dart->num_vnode; diff --git a/src/commons/utils/string_utils.c b/src/commons/utils/string_utils.c index f1101c50a..b98c845ec 100644 --- a/src/commons/utils/string_utils.c +++ b/src/commons/utils/string_utils.c @@ -319,8 +319,8 @@ gen_random_strings(int count, int minlen, int maxlen, int alphabet_size) char *str = (char *)calloc(len + 1, sizeof(char)); for (i = 0; i < len; i++) { unsigned int randnum = (unsigned int)rand(); - char chr = VISIBLE_ALPHABET[randnum % abc_size]; - str[i] = chr; + char chr = VISIBLE_ALPHABET[randnum % abc_size]; + str[i] = chr; } str[len] = '\0'; // Null-terminate the string result[c] = str; diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index 6e348ece2..0d8faf999 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -2680,10 +2680,10 @@ HG_TEST_RPC_CB(region_release, handle) hg_return_t hg_ret; region_lock_in_t in; region_lock_out_t out; - const struct hg_info * hg_info = NULL; + const struct hg_info * hg_info = NULL; data_server_region_t * target_obj = NULL; - int error = 0; - int dirty_reg = 0; + int error = 0; + int dirty_reg = 0; hg_size_t size, size2; void * data_buf; struct pdc_region_info * server_region; @@ -2692,7 +2692,7 @@ HG_TEST_RPC_CB(region_release, handle) struct buf_map_release_bulk_args * buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info * remote_reg_info = NULL; + struct pdc_region_info * remote_reg_info = NULL; region_buf_map_t * eltt = NULL, *eltt2 = NULL, *eltt_tmp = NULL; hg_uint32_t remote_count; void ** data_ptrs_to = NULL; diff --git a/src/tests/dart_algo_sim.c b/src/tests/dart_algo_sim.c index 3459b5430..2c9aef866 100644 --- a/src/tests/dart_algo_sim.c +++ b/src/tests/dart_algo_sim.c @@ -307,8 +307,8 @@ gen_random_strings_with_cb(int count, int minlen, int maxlen, int alphabet_size, char *str = (char *)calloc(len + 1, sizeof(len)); for (i = 0; i < len; i++) { unsigned int randnum = (unsigned int)rand(); - char chr = (char)((randnum % alphabet_size) + 65); - str[i] = chr; + char chr = (char)((randnum % alphabet_size) + 65); + str[i] = chr; } result[c] = str; if (insert_cb != NULL && search_cb != NULL) { diff --git a/src/tests/read_write_col_perf.c b/src/tests/read_write_col_perf.c index d089de82f..95432c84b 100644 --- a/src/tests/read_write_col_perf.c +++ b/src/tests/read_write_col_perf.c @@ -35,9 +35,11 @@ #include "pdc_timing.h" -#define BUF_LEN 128 -#define MAX_DATA_SIZE 1000000 -#define GOTO_DONE_ERROR() ret_value = 1; goto done; +#define BUF_LEN 128 +#define MAX_DATA_SIZE 1000000 +#define GOTO_DONE_ERROR() \ + ret_value = 1; \ + goto done; int main(int argc, char **argv) @@ -118,7 +120,7 @@ main(int argc, char **argv) } n_objects = atoi(argv[1]); - if(data_size > MAX_DATA_SIZE) { + if (data_size > MAX_DATA_SIZE) { GOTO_DONE_ERROR(); } From 4daf9d8590802d457efdba7592bf8212c7962b5e Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Thu, 24 Apr 2025 05:57:27 -0700 Subject: [PATCH 30/43] another --- examples/read_write_col_perf.c | 111 ++++++++++-------- examples/read_write_perf.c | 108 +++++++++-------- src/commons/collections/pdc_set_test.c | 2 +- .../pdc_server_region/pdc_server_data.c | 2 +- src/tests/read_write_perf.c | 108 +++++++++-------- 5 files changed, 178 insertions(+), 153 deletions(-) diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c index aa250d0e0..d27d50f4b 100644 --- a/examples/read_write_col_perf.c +++ b/examples/read_write_col_perf.c @@ -34,6 +34,8 @@ #include "pdc_analysis.h" #define BUF_LEN 128 +#define MAX_DATA_SIZE 1000000 +#define GOTO_DONE_ERROR() ret_value = 1; goto done; int main(int argc, char **argv) @@ -73,7 +75,7 @@ main(int argc, char **argv) ndim = 3; } else { - LOG_INFO("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3"); + LOG_INFO("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3\n"); } local_offset[0] = 0; @@ -113,6 +115,12 @@ main(int argc, char **argv) dims[2] = offset_length[2]; } n_objects = atoi(argv[1]); + + if(data_size > MAX_DATA_SIZE) { + LOG_ERROR("data_size exceeds max size\n"); + GOTO_DONE_ERROR(); + } + int *data = (int *)malloc(sizeof(int) * data_size); char hostname[256]; @@ -135,27 +143,26 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Failed to create container property"); - ret_value = 1; + GOTO_DONE_ERROR(); } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Failed to create container"); - ret_value = 1; + LOG_ERROR("Failed to create container\n"); + GOTO_DONE_ERROR(); } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Failed to create object property"); - ret_value = 1; + LOG_ERROR("Failed to create object property\n"); + GOTO_DONE_ERROR(); } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Failed to set obj type"); - ret_value = 1; + LOG_ERROR("Failed to set obj type\n"); + GOTO_DONE_ERROR(); } PDCprop_set_obj_dims(obj_prop, ndim, dims); PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -177,8 +184,8 @@ main(int argc, char **argv) #endif if (obj1 <= 0) { - LOG_ERROR("Failed to create object"); - ret_value = 1; + LOG_ERROR("Failed to create object\n"); + GOTO_DONE_ERROR(); } reg = PDCregion_create(ndim, local_offset, offset_length); reg_global = PDCregion_create(ndim, offset, offset_length); @@ -187,45 +194,45 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_WRITE, obj1, reg, reg_global); if (transfer_request == 0) { - LOG_INFO("PDCregion_transfer_create failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_create failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); ret = PDCregion_transfer_start(transfer_request); write_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_start failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_start failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); ret = PDCregion_transfer_wait(transfer_request); write_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_wait failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_wait failed\n"); + GOTO_DONE_ERROR(); } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_close failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_close failed\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Failed to close local region"); - ret_value = 1; + LOG_ERROR("Failed to close local region\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Failed to close global region"); - ret_value = 1; + LOG_ERROR("Failed to close global region\n"); + GOTO_DONE_ERROR(); } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Failed to close object o1"); - ret_value = 1; + LOG_ERROR("Failed to close object o1\n"); + GOTO_DONE_ERROR(); } } @@ -235,8 +242,8 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d", i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_ERROR("Failed to open object"); - ret_value = 1; + LOG_ERROR("Failed to open object\n"); + GOTO_DONE_ERROR(); } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -247,8 +254,8 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_READ, obj1, reg, reg_global); if (transfer_request == 0) { - LOG_INFO("PDCregion_transfer_create failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_create failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -256,8 +263,8 @@ main(int argc, char **argv) read_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_start failed"); - exit(-1); + LOG_INFO("PDCregion_transfer_start failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -265,35 +272,35 @@ main(int argc, char **argv) read_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_wait failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_wait failed\n"); + GOTO_DONE_ERROR(); } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_close failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_close failed\n"); + GOTO_DONE_ERROR(); } if (ret != SUCCEED) { - LOG_INFO("PDCbuf_obj_unmap failed"); - ret_value = 1; + LOG_INFO("PDCbuf_obj_unmap failed\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Failed to close local region"); - ret_value = 1; + LOG_ERROR("Failed to close local region\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Failed to close global region"); - ret_value = 1; + LOG_ERROR("Failed to close global region\n"); + GOTO_DONE_ERROR(); } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Failed to close object o1"); - ret_value = 1; + LOG_ERROR("Failed to close object o1\n"); + GOTO_DONE_ERROR(); } } @@ -301,23 +308,23 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Failed to close container c1"); - ret_value = 1; + LOG_ERROR("Failed to close container c1\n"); + GOTO_DONE_ERROR(); } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Failed to close property"); - ret_value = 1; + LOG_ERROR("Failed to close property\n"); + GOTO_DONE_ERROR(); } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Failed to close property"); - ret_value = 1; + LOG_ERROR("Failed to close property\n"); + GOTO_DONE_ERROR(); } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Failed to close PDC"); - ret_value = 1; + LOG_ERROR("Failed to close PDC\n"); + GOTO_DONE_ERROR(); } #ifdef ENABLE_MPI MPI_Reduce(&write_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); @@ -345,6 +352,8 @@ main(int argc, char **argv) } free(data); + +done: #endif #ifdef ENABLE_MPI diff --git a/examples/read_write_perf.c b/examples/read_write_perf.c index 923fdae1a..1056b3bc9 100644 --- a/examples/read_write_perf.c +++ b/examples/read_write_perf.c @@ -34,6 +34,8 @@ #include "pdc_analysis.h" #define BUF_LEN 128 +#define MAX_DATA_SIZE 1000000 +#define GOTO_DONE_ERROR() ret_value = 1; goto done; int main(int argc, char **argv) @@ -67,7 +69,7 @@ main(int argc, char **argv) ndim = 3; } else { - LOG_INFO("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3"); + LOG_INFO("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3\n"); } local_offset[0] = 0; @@ -101,6 +103,12 @@ main(int argc, char **argv) data_size *= (data_size_array[1] * data_size_array[2] * 1048576); } n_objects = atoi(argv[1]); + + if(data_size > MAX_DATA_SIZE) { + LOG_ERROR("data_size exceeds max size\n"); + GOTO_DONE_ERROR(); + } + int *data = (int *)malloc(sizeof(int) * data_size); memcpy(dims, offset_length, sizeof(uint64_t) * ndim); @@ -129,27 +137,27 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Failed to create container property"); - ret_value = 1; + LOG_ERROR("Failed to create container property\n"); + GOTO_DONE_ERROR(); } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Failed to create container"); - ret_value = 1; + LOG_ERROR("Failed to create container\n"); + GOTO_DONE_ERROR(); } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Failed to create object property"); - ret_value = 1; + LOG_ERROR("Failed to create object property\n"); + GOTO_DONE_ERROR(); } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Failed to set obj type"); - ret_value = 1; + LOG_ERROR("Failed to set obj type\n"); + GOTO_DONE_ERROR(); } PDCprop_set_obj_dims(obj_prop, ndim, dims); PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -165,8 +173,8 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 <= 0) { - LOG_ERROR("Failed to create object"); - ret_value = 1; + LOG_ERROR("Failed to create object\n"); + GOTO_DONE_ERROR(); } reg = PDCregion_create(ndim, offset, offset_length); @@ -177,8 +185,8 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_WRITE, obj1, reg, reg_global); if (transfer_request == 0) { - LOG_INFO("PDCregion_transfer_create failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_create failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -186,8 +194,8 @@ main(int argc, char **argv) write_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_start failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_start failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -195,29 +203,29 @@ main(int argc, char **argv) write_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_wait failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_wait failed\n"); + GOTO_DONE_ERROR(); } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_close failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_close failed\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Failed to close local region"); - ret_value = 1; + LOG_ERROR("Failed to close local region\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Failed to close global region"); - ret_value = 1; + LOG_ERROR("Failed to close global region\n"); + GOTO_DONE_ERROR(); } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Failed to close object o1"); - ret_value = 1; + LOG_ERROR("Failed to close object o1\n"); + GOTO_DONE_ERROR(); } } @@ -227,8 +235,8 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_ERROR("Failed to open object"); - ret_value = 1; + LOG_ERROR("Failed to open object\n"); + GOTO_DONE_ERROR(); } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -239,8 +247,8 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_READ, obj1, reg, reg_global); if (transfer_request == 0) { - LOG_INFO("PDCregion_transfer_create failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_create failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -248,7 +256,7 @@ main(int argc, char **argv) read_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_start failed"); + LOG_INFO("PDCregion_transfer_start failed\n"); exit(-1); } @@ -257,35 +265,35 @@ main(int argc, char **argv) read_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_wait failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_wait failed\n"); + GOTO_DONE_ERROR(); } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_close failed"); - ret_value = 1; + LOG_INFO("PDCregion_transfer_close failed\n"); + GOTO_DONE_ERROR(); } if (ret != SUCCEED) { - LOG_INFO("PDCbuf_obj_unmap failed"); - ret_value = 1; + LOG_INFO("PDCbuf_obj_unmap failed\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Failed to close local region"); - ret_value = 1; + LOG_ERROR("Failed to close local region\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Failed to close global region"); - ret_value = 1; + LOG_ERROR("Failed to close global region\n"); + GOTO_DONE_ERROR(); } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Failed to close object o1"); - ret_value = 1; + LOG_ERROR("Failed to close object o1\n"); + GOTO_DONE_ERROR(); } } @@ -293,23 +301,23 @@ main(int argc, char **argv) // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Failed to close container c1"); - ret_value = 1; + LOG_ERROR("Failed to close container c1\n"); + GOTO_DONE_ERROR(); } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Failed to close property"); - ret_value = 1; + LOG_ERROR("Failed to close property\n"); + GOTO_DONE_ERROR(); } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Failed to close property"); - ret_value = 1; + LOG_ERROR("Failed to close property\n"); + GOTO_DONE_ERROR(); } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Failed to close PDC"); - ret_value = 1; + LOG_ERROR("Failed to close PDC\n"); + GOTO_DONE_ERROR(); } #ifdef ENABLE_MPI MPI_Reduce(&write_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); diff --git a/src/commons/collections/pdc_set_test.c b/src/commons/collections/pdc_set_test.c index 694d8370d..ed75aa57b 100644 --- a/src/commons/collections/pdc_set_test.c +++ b/src/commons/collections/pdc_set_test.c @@ -52,7 +52,7 @@ main(int argc, char **argv) } // iterate through all values - SetIterator *it; + SetIterator *it = NULL; set_iterate(set, it); while (set_iter_has_more(it)) { uint64_t *value = set_iter_next(it); diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index ae7d96a01..24d64147f 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -418,7 +418,7 @@ PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg_ptr new_obj_reg->close_flag = close_flag; new_obj_reg->fd = open(new_obj_reg->storage_location, O_RDWR | O_CREAT, 0666); if (new_obj_reg->fd < 0) { - goto done; + PGOTO_ERROR(FAIL, "Failed to open file"); } } } diff --git a/src/tests/read_write_perf.c b/src/tests/read_write_perf.c index 152140d5f..189eb6bbc 100644 --- a/src/tests/read_write_perf.c +++ b/src/tests/read_write_perf.c @@ -36,6 +36,8 @@ #include "pdc_timing.h" #define BUF_LEN 128 +#define MAX_DATA_SIZE 1000000 +#define GOTO_DONE_ERROR() ret_value = 1; goto done; int main(int argc, char **argv) @@ -69,7 +71,7 @@ main(int argc, char **argv) ndim = 3; } else { - LOG_INFO("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3"); + LOG_JUST_PRINT("usage: ./read_write_perf n_objects data_size1 datasize2 datasize3\n"); } local_offset[0] = 0; @@ -103,6 +105,12 @@ main(int argc, char **argv) data_size *= (data_size_array[1] * data_size_array[2] * 1048576); } n_objects = atoi(argv[1]); + + if(data_size > MAX_DATA_SIZE) { + LOG_ERROR("data_size exceeds max size\n"); + GOTO_DONE_ERROR(); + } + int *data = (int *)malloc(sizeof(int) * data_size); memcpy(dims, offset_length, sizeof(uint64_t) * ndim); @@ -116,7 +124,7 @@ main(int argc, char **argv) if (rank == 0) { LOG_INFO("number of dimensions in this test is %d\n", ndim); LOG_INFO("data size = %llu\n", (long long unsigned)data_size); - LOG_ERROR("First dim has size %d\n", data_size_array[0]); + LOG_INFO("First dim has size %d\n", data_size_array[0]); if (ndim >= 2) { LOG_INFO("second dim has size %d\n", data_size_array[1]); } @@ -131,27 +139,27 @@ main(int argc, char **argv) // create a container property cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc); if (cont_prop <= 0) { - LOG_ERROR("Failed to create container property"); - ret_value = 1; + LOG_ERROR("Failed to create container property\n"); + GOTO_DONE_ERROR(); } // create a container sprintf(cont_name, "c%d", rank); cont = PDCcont_create(cont_name, cont_prop); if (cont <= 0) { - LOG_ERROR("Failed to create container"); - ret_value = 1; + LOG_ERROR("Failed to create container\n"); + GOTO_DONE_ERROR(); } // create an object property obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc); if (obj_prop <= 0) { - LOG_ERROR("Failed to create object property"); - ret_value = 1; + LOG_ERROR("Failed to create object property\n"); + GOTO_DONE_ERROR(); } ret = PDCprop_set_obj_type(obj_prop, PDC_INT); if (ret != SUCCEED) { - LOG_ERROR("Failed to set obj type"); - ret_value = 1; + LOG_ERROR("Failed to set obj type\n"); + GOTO_DONE_ERROR(); } PDCprop_set_obj_dims(obj_prop, ndim, dims); PDCprop_set_obj_user_id(obj_prop, getuid()); @@ -168,7 +176,7 @@ main(int argc, char **argv) obj1 = PDCobj_create(cont, obj_name1, obj_prop); if (obj1 <= 0) { LOG_ERROR("Failed to create object"); - ret_value = 1; + GOTO_DONE_ERROR(); } reg = PDCregion_create(ndim, offset, offset_length); @@ -179,8 +187,8 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_WRITE, obj1, reg, reg_global); if (transfer_request == 0) { - LOG_ERROR("PDCregion_transfer_create failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_create failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -188,8 +196,8 @@ main(int argc, char **argv) write_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_ERROR("PDCregion_transfer_start failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_start failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -197,29 +205,29 @@ main(int argc, char **argv) write_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_ERROR("PDCregion_transfer_wait failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_wait failed\n"); + GOTO_DONE_ERROR(); } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("PDCregion_transfer_close failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_close failed\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Failed to close local region"); - ret_value = 1; + LOG_ERROR("Failed to close local region\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Failed to close global region"); - ret_value = 1; + LOG_ERROR("Failed to close global region\n"); + GOTO_DONE_ERROR(); } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Failed to close object o1"); - ret_value = 1; + LOG_ERROR("Failed to close object o1\n"); + GOTO_DONE_ERROR(); } } #ifdef PDC_TIMING @@ -230,8 +238,8 @@ main(int argc, char **argv) sprintf(obj_name1, "o1_%d_%d", rank, i); obj1 = PDCobj_open(obj_name1, pdc); if (obj1 <= 0) { - LOG_ERROR("Failed to open object"); - ret_value = 1; + LOG_ERROR("Failed to open object\n"); + GOTO_DONE_ERROR(); } reg = PDCregion_create(ndim, local_offset, offset_length); @@ -242,8 +250,8 @@ main(int argc, char **argv) transfer_request = PDCregion_transfer_create(data, PDC_READ, obj1, reg, reg_global); if (transfer_request == 0) { - LOG_INFO("PDCregion_transfer_create failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_create failed\n"); + GOTO_DONE_ERROR(); } start = MPI_Wtime(); @@ -251,7 +259,7 @@ main(int argc, char **argv) read_reg_transfer_start_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_INFO("PDCregion_transfer_start failed"); + LOG_ERROR("PDCregion_transfer_start failed\n"); exit(-1); } @@ -260,35 +268,35 @@ main(int argc, char **argv) read_reg_transfer_wait_time += MPI_Wtime() - start; if (ret != SUCCEED) { - LOG_ERROR("PDCregion_transfer_wait failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_wait failed\n"); + GOTO_DONE_ERROR(); } ret = PDCregion_transfer_close(transfer_request); if (ret != SUCCEED) { - LOG_ERROR("PDCregion_transfer_close failed"); - ret_value = 1; + LOG_ERROR("PDCregion_transfer_close failed\n"); + GOTO_DONE_ERROR(); } if (ret != SUCCEED) { - LOG_ERROR("PDCbuf_obj_unmap failed"); - ret_value = 1; + LOG_ERROR("PDCbuf_obj_unmap failed\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg) < 0) { - LOG_ERROR("Failed to close local region"); - ret_value = 1; + LOG_ERROR("Failed to close local region\n"); + GOTO_DONE_ERROR(); } if (PDCregion_close(reg_global) < 0) { - LOG_ERROR("Failed to close global region"); - ret_value = 1; + LOG_ERROR("Failed to close global region\n"); + GOTO_DONE_ERROR(); } if (PDCobj_close(obj1) < 0) { - LOG_ERROR("Failed to close object o1"); - ret_value = 1; + LOG_ERROR("Failed to close object o1\n"); + GOTO_DONE_ERROR(); } } #ifdef PDC_TIMING @@ -296,23 +304,23 @@ main(int argc, char **argv) #endif // close a container if (PDCcont_close(cont) < 0) { - LOG_ERROR("Failed to close container c1"); - ret_value = 1; + LOG_ERROR("Failed to close container c1\n"); + GOTO_DONE_ERROR(); } // close a object property if (PDCprop_close(obj_prop) < 0) { - LOG_ERROR("Failed to close property"); - ret_value = 1; + LOG_ERROR("Failed to close property\n"); + GOTO_DONE_ERROR(); } // close a container property if (PDCprop_close(cont_prop) < 0) { - LOG_ERROR("Failed to close property"); - ret_value = 1; + LOG_ERROR("Failed to close property\n"); + GOTO_DONE_ERROR(); } // close pdc if (PDCclose(pdc) < 0) { - LOG_ERROR("Failed to close PDC"); - ret_value = 1; + LOG_ERROR("Failed to close PDC\n"); + GOTO_DONE_ERROR(); } #ifdef ENABLE_MPI MPI_Reduce(&write_reg_transfer_start_time, &start, 1, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD); From 28f9380785c26f18aeccdf6f10e24f0e81f1b278 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 24 Apr 2025 12:57:51 +0000 Subject: [PATCH 31/43] Committing clang-format changes --- examples/read_write_col_perf.c | 10 ++++++---- examples/read_write_perf.c | 10 ++++++---- src/tests/read_write_perf.c | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c index d27d50f4b..c688e583c 100644 --- a/examples/read_write_col_perf.c +++ b/examples/read_write_col_perf.c @@ -33,9 +33,11 @@ #include "pdc.h" #include "pdc_analysis.h" -#define BUF_LEN 128 -#define MAX_DATA_SIZE 1000000 -#define GOTO_DONE_ERROR() ret_value = 1; goto done; +#define BUF_LEN 128 +#define MAX_DATA_SIZE 1000000 +#define GOTO_DONE_ERROR() \ + ret_value = 1; \ + goto done; int main(int argc, char **argv) @@ -116,7 +118,7 @@ main(int argc, char **argv) } n_objects = atoi(argv[1]); - if(data_size > MAX_DATA_SIZE) { + if (data_size > MAX_DATA_SIZE) { LOG_ERROR("data_size exceeds max size\n"); GOTO_DONE_ERROR(); } diff --git a/examples/read_write_perf.c b/examples/read_write_perf.c index 1056b3bc9..ea8366683 100644 --- a/examples/read_write_perf.c +++ b/examples/read_write_perf.c @@ -33,9 +33,11 @@ #include "pdc.h" #include "pdc_analysis.h" -#define BUF_LEN 128 -#define MAX_DATA_SIZE 1000000 -#define GOTO_DONE_ERROR() ret_value = 1; goto done; +#define BUF_LEN 128 +#define MAX_DATA_SIZE 1000000 +#define GOTO_DONE_ERROR() \ + ret_value = 1; \ + goto done; int main(int argc, char **argv) @@ -104,7 +106,7 @@ main(int argc, char **argv) } n_objects = atoi(argv[1]); - if(data_size > MAX_DATA_SIZE) { + if (data_size > MAX_DATA_SIZE) { LOG_ERROR("data_size exceeds max size\n"); GOTO_DONE_ERROR(); } diff --git a/src/tests/read_write_perf.c b/src/tests/read_write_perf.c index 189eb6bbc..74c9392a8 100644 --- a/src/tests/read_write_perf.c +++ b/src/tests/read_write_perf.c @@ -35,9 +35,11 @@ #include "pdc_timing.h" -#define BUF_LEN 128 -#define MAX_DATA_SIZE 1000000 -#define GOTO_DONE_ERROR() ret_value = 1; goto done; +#define BUF_LEN 128 +#define MAX_DATA_SIZE 1000000 +#define GOTO_DONE_ERROR() \ + ret_value = 1; \ + goto done; int main(int argc, char **argv) @@ -106,7 +108,7 @@ main(int argc, char **argv) } n_objects = atoi(argv[1]); - if(data_size > MAX_DATA_SIZE) { + if (data_size > MAX_DATA_SIZE) { LOG_ERROR("data_size exceeds max size\n"); GOTO_DONE_ERROR(); } From 962db67f75db526780bc0d08a2bdc65c35ddd944 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Thu, 24 Apr 2025 06:01:20 -0700 Subject: [PATCH 32/43] another --- examples/read_write_perf.c | 1 + src/tests/read_write_perf.c | 1 + 2 files changed, 2 insertions(+) diff --git a/examples/read_write_perf.c b/examples/read_write_perf.c index 1056b3bc9..8289af81e 100644 --- a/examples/read_write_perf.c +++ b/examples/read_write_perf.c @@ -347,6 +347,7 @@ main(int argc, char **argv) free(data); #endif +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/read_write_perf.c b/src/tests/read_write_perf.c index 189eb6bbc..968e72b14 100644 --- a/src/tests/read_write_perf.c +++ b/src/tests/read_write_perf.c @@ -350,6 +350,7 @@ main(int argc, char **argv) free(data); #endif +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif From c9398cb814ce6672b2f297d4b817896354ed01dd Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Thu, 24 Apr 2025 08:04:13 -0700 Subject: [PATCH 33/43] another --- examples/bdcats.c | 7 +++++++ examples/bdcats_batch.c | 8 ++++++++ examples/bdcats_old.c | 2 ++ examples/vpicio.c | 3 +++ examples/vpicio_batch.c | 3 +++ examples/vpicio_old.c | 7 +++++++ src/tests/bdcats.c | 7 +++++++ src/tests/bdcats_old.c | 7 +++++++ src/tests/bdcats_v2.c | 2 ++ src/tests/obj_transformation.c | 2 ++ src/tests/vpicio.c | 8 ++++++++ src/tests/vpicio_mts.c | 8 ++++++++ src/tests/vpicio_old.c | 7 +++++++ src/tests/vpicio_v2.c | 2 ++ 14 files changed, 73 insertions(+) diff --git a/examples/bdcats.c b/examples/bdcats.c index cd1f1e95f..c96f17c9c 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -82,6 +83,11 @@ main(int argc, char **argv) LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } + if(numparticles > MAX_PARTICLES) { + LOG_ERRROR("numparticles exceeds max size\n"); + goto done; + } + x = (float *)malloc(numparticles * sizeof(float)); y = (float *)malloc(numparticles * sizeof(float)); z = (float *)malloc(numparticles * sizeof(float)); @@ -463,6 +469,7 @@ main(int argc, char **argv) free(offset_remote); free(mysize); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/examples/bdcats_batch.c b/examples/bdcats_batch.c index e69aef296..13895d13a 100644 --- a/examples/bdcats_batch.c +++ b/examples/bdcats_batch.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) #define N_OBJS 8 double @@ -115,6 +116,11 @@ main(int argc, char **argv) sleep_time, timestep, numparticles, test_method); } + if(numparticles > MAX_PARTICLES) { + LOG_ERRROR("numparticles exceeds max size\n"); + goto done; + } + x = (float *)malloc(numparticles * sizeof(float)); y = (float *)malloc(numparticles * sizeof(float)); z = (float *)malloc(numparticles * sizeof(float)); @@ -710,6 +716,8 @@ main(int argc, char **argv) free(pz); free(id1); free(id2); + +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/examples/bdcats_old.c b/examples/bdcats_old.c index 77c45a8f1..820398558 100644 --- a/examples/bdcats_old.c +++ b/examples/bdcats_old.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -390,6 +391,7 @@ main(int argc, char **argv) free(offset_remote); free(mysize); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/examples/vpicio.c b/examples/vpicio.c index b55603924..4ebba5559 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -560,6 +561,8 @@ main(int argc, char **argv) free(pz); free(id1); free(id2); + +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index 216627791..4e68cd55e 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) #define N_OBJS 8 double @@ -819,6 +820,8 @@ main(int argc, char **argv) free(pz); free(id1); free(id2); + +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index 30c7e2316..ff436b6d3 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -92,6 +93,11 @@ main(int argc, char **argv) dims[0] = numparticles; + if(numparticles > MAX_PARTICLES) { + LOG_ERRROR("numparticles exceeds max size\n"); + goto done; + } + x = (float *)malloc(numparticles * sizeof(float)); y = (float *)malloc(numparticles * sizeof(float)); z = (float *)malloc(numparticles * sizeof(float)); @@ -548,6 +554,7 @@ main(int argc, char **argv) free(id1); free(id2); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/bdcats.c b/src/tests/bdcats.c index 228aa1b2e..edc3767e0 100644 --- a/src/tests/bdcats.c +++ b/src/tests/bdcats.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -82,6 +83,11 @@ main(int argc, char **argv) LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } + if(numparticles > MAX_PARTICLES) { + LOG_ERROR("numparticles exceeds max size\n"); + goto done; + } + x = (float *)malloc(numparticles * sizeof(float)); y = (float *)malloc(numparticles * sizeof(float)); z = (float *)malloc(numparticles * sizeof(float)); @@ -431,6 +437,7 @@ main(int argc, char **argv) free(offset_remote); free(mysize); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/bdcats_old.c b/src/tests/bdcats_old.c index 7570988a4..1439b776d 100644 --- a/src/tests/bdcats_old.c +++ b/src/tests/bdcats_old.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -78,6 +79,11 @@ main(int argc, char **argv) LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } + if(numparticles > MAX_PARTICLES) { + LOG_ERROR("numparticles exceeds max size\n"); + goto done; + } + x = (float *)malloc(numparticles * sizeof(float)); y = (float *)malloc(numparticles * sizeof(float)); z = (float *)malloc(numparticles * sizeof(float)); @@ -390,6 +396,7 @@ main(int argc, char **argv) free(offset_remote); free(mysize); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/bdcats_v2.c b/src/tests/bdcats_v2.c index e945cdeaf..eb65a17fa 100644 --- a/src/tests/bdcats_v2.c +++ b/src/tests/bdcats_v2.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -467,6 +468,7 @@ main(int argc, char **argv) free(offset_remote); free(mysize); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/obj_transformation.c b/src/tests/obj_transformation.c index d6f8b2791..fa822f5b7 100644 --- a/src/tests/obj_transformation.c +++ b/src/tests/obj_transformation.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -543,6 +544,7 @@ main(int argc, char **argv) free(id1); free(id2); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/vpicio.c b/src/tests/vpicio.c index f0bf64f92..1bb5ef1f6 100644 --- a/src/tests/vpicio.c +++ b/src/tests/vpicio.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -96,6 +97,11 @@ main(int argc, char **argv) dims[0] = numparticles * size; + if(numparticles > MAX_PARTICLES) { + LOG_ERROR("numparticles exceeds max size\n"); + goto done; + } + x = (float *)malloc(numparticles * sizeof(float)); y = (float *)malloc(numparticles * sizeof(float)); z = (float *)malloc(numparticles * sizeof(float)); @@ -597,6 +603,8 @@ main(int argc, char **argv) free(pz); free(id1); free(id2); + +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/vpicio_mts.c b/src/tests/vpicio_mts.c index 4f5a8705e..a78a0ae67 100644 --- a/src/tests/vpicio_mts.c +++ b/src/tests/vpicio_mts.c @@ -35,6 +35,7 @@ #include "pdc_timing.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -92,6 +93,11 @@ main(int argc, char **argv) dims[0] = numparticles * size; + if(numparticles > MAX_PARTICLES) { + LOG_ERROR("numparticles exceeds max size\n"); + goto done; + } + x = (float *)malloc(numparticles * sizeof(float)); y = (float *)malloc(numparticles * sizeof(float)); z = (float *)malloc(numparticles * sizeof(float)); @@ -409,6 +415,8 @@ main(int argc, char **argv) free(pz); free(id1); free(id2); + +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/vpicio_old.c b/src/tests/vpicio_old.c index fe2786b52..292fbe403 100644 --- a/src/tests/vpicio_old.c +++ b/src/tests/vpicio_old.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -92,6 +93,11 @@ main(int argc, char **argv) dims[0] = numparticles; + if(numparticles > MAX_PARTICLES) { + LOG_ERROR("numparticles exceeds max size\n"); + goto done; + } + x = (float *)malloc(numparticles * sizeof(float)); y = (float *)malloc(numparticles * sizeof(float)); z = (float *)malloc(numparticles * sizeof(float)); @@ -548,6 +554,7 @@ main(int argc, char **argv) free(id1); free(id2); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif diff --git a/src/tests/vpicio_v2.c b/src/tests/vpicio_v2.c index ff0347fbc..0fecfdfab 100644 --- a/src/tests/vpicio_v2.c +++ b/src/tests/vpicio_v2.c @@ -34,6 +34,7 @@ #include "pdc.h" #define NPARTICLES 8388608 +#define MAX_PARTICLES (NPARTICLES * 2) double uniform_random_number() @@ -571,6 +572,7 @@ main(int argc, char **argv) free(id1); free(id2); +done: #ifdef ENABLE_MPI MPI_Finalize(); #endif From 8688af7e04e08a3dfa880b65b3b803a85a9a1fc8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 24 Apr 2025 15:04:40 +0000 Subject: [PATCH 34/43] Committing clang-format changes --- examples/bdcats.c | 4 ++-- examples/bdcats_batch.c | 6 +++--- examples/bdcats_old.c | 2 +- examples/vpicio.c | 2 +- examples/vpicio_batch.c | 4 ++-- examples/vpicio_old.c | 4 ++-- src/tests/bdcats.c | 4 ++-- src/tests/bdcats_old.c | 4 ++-- src/tests/bdcats_v2.c | 2 +- src/tests/obj_transformation.c | 2 +- src/tests/vpicio.c | 4 ++-- src/tests/vpicio_mts.c | 4 ++-- src/tests/vpicio_old.c | 4 ++-- src/tests/vpicio_v2.c | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/bdcats.c b/examples/bdcats.c index c96f17c9c..e7c93c114 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double @@ -83,7 +83,7 @@ main(int argc, char **argv) LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } - if(numparticles > MAX_PARTICLES) { + if (numparticles > MAX_PARTICLES) { LOG_ERRROR("numparticles exceeds max size\n"); goto done; } diff --git a/examples/bdcats_batch.c b/examples/bdcats_batch.c index 13895d13a..1bdb74ff9 100644 --- a/examples/bdcats_batch.c +++ b/examples/bdcats_batch.c @@ -33,9 +33,9 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) -#define N_OBJS 8 +#define N_OBJS 8 double uniform_random_number() @@ -116,7 +116,7 @@ main(int argc, char **argv) sleep_time, timestep, numparticles, test_method); } - if(numparticles > MAX_PARTICLES) { + if (numparticles > MAX_PARTICLES) { LOG_ERRROR("numparticles exceeds max size\n"); goto done; } diff --git a/examples/bdcats_old.c b/examples/bdcats_old.c index 820398558..f2108264e 100644 --- a/examples/bdcats_old.c +++ b/examples/bdcats_old.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double diff --git a/examples/vpicio.c b/examples/vpicio.c index 4ebba5559..9ddf0d89c 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index 4e68cd55e..f386e6ffd 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -33,9 +33,9 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) -#define N_OBJS 8 +#define N_OBJS 8 double uniform_random_number() diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index ff436b6d3..5c394adf4 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double @@ -93,7 +93,7 @@ main(int argc, char **argv) dims[0] = numparticles; - if(numparticles > MAX_PARTICLES) { + if (numparticles > MAX_PARTICLES) { LOG_ERRROR("numparticles exceeds max size\n"); goto done; } diff --git a/src/tests/bdcats.c b/src/tests/bdcats.c index edc3767e0..3033341a6 100644 --- a/src/tests/bdcats.c +++ b/src/tests/bdcats.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double @@ -83,7 +83,7 @@ main(int argc, char **argv) LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } - if(numparticles > MAX_PARTICLES) { + if (numparticles > MAX_PARTICLES) { LOG_ERROR("numparticles exceeds max size\n"); goto done; } diff --git a/src/tests/bdcats_old.c b/src/tests/bdcats_old.c index 1439b776d..e52facafe 100644 --- a/src/tests/bdcats_old.c +++ b/src/tests/bdcats_old.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double @@ -79,7 +79,7 @@ main(int argc, char **argv) LOG_INFO("Writing %" PRIu64 " number of particles with %d clients.\n", numparticles, size); } - if(numparticles > MAX_PARTICLES) { + if (numparticles > MAX_PARTICLES) { LOG_ERROR("numparticles exceeds max size\n"); goto done; } diff --git a/src/tests/bdcats_v2.c b/src/tests/bdcats_v2.c index eb65a17fa..b72b9032b 100644 --- a/src/tests/bdcats_v2.c +++ b/src/tests/bdcats_v2.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double diff --git a/src/tests/obj_transformation.c b/src/tests/obj_transformation.c index fa822f5b7..223a3afa6 100644 --- a/src/tests/obj_transformation.c +++ b/src/tests/obj_transformation.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double diff --git a/src/tests/vpicio.c b/src/tests/vpicio.c index 1bb5ef1f6..255b3323b 100644 --- a/src/tests/vpicio.c +++ b/src/tests/vpicio.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double @@ -97,7 +97,7 @@ main(int argc, char **argv) dims[0] = numparticles * size; - if(numparticles > MAX_PARTICLES) { + if (numparticles > MAX_PARTICLES) { LOG_ERROR("numparticles exceeds max size\n"); goto done; } diff --git a/src/tests/vpicio_mts.c b/src/tests/vpicio_mts.c index a78a0ae67..4f81667b3 100644 --- a/src/tests/vpicio_mts.c +++ b/src/tests/vpicio_mts.c @@ -34,7 +34,7 @@ #include "pdc.h" #include "pdc_timing.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double @@ -93,7 +93,7 @@ main(int argc, char **argv) dims[0] = numparticles * size; - if(numparticles > MAX_PARTICLES) { + if (numparticles > MAX_PARTICLES) { LOG_ERROR("numparticles exceeds max size\n"); goto done; } diff --git a/src/tests/vpicio_old.c b/src/tests/vpicio_old.c index 292fbe403..8a461fec8 100644 --- a/src/tests/vpicio_old.c +++ b/src/tests/vpicio_old.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double @@ -93,7 +93,7 @@ main(int argc, char **argv) dims[0] = numparticles; - if(numparticles > MAX_PARTICLES) { + if (numparticles > MAX_PARTICLES) { LOG_ERROR("numparticles exceeds max size\n"); goto done; } diff --git a/src/tests/vpicio_v2.c b/src/tests/vpicio_v2.c index 0fecfdfab..95cde8a6a 100644 --- a/src/tests/vpicio_v2.c +++ b/src/tests/vpicio_v2.c @@ -33,7 +33,7 @@ #include #include "pdc.h" -#define NPARTICLES 8388608 +#define NPARTICLES 8388608 #define MAX_PARTICLES (NPARTICLES * 2) double From 75460e9541e87804490e5744e652d0c6c7d015ae Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Thu, 24 Apr 2025 09:34:26 -0700 Subject: [PATCH 35/43] another --- src/server/pdc_server_region/pdc_server_data.c | 2 +- src/tests/helper/julia_helper_loader.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 24d64147f..fbbcde4af 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -416,7 +416,7 @@ PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg_ptr } if (new_obj_reg->fd < 0) { new_obj_reg->close_flag = close_flag; - new_obj_reg->fd = open(new_obj_reg->storage_location, O_RDWR | O_CREAT, 0666); + new_obj_reg->fd = open(new_obj_reg->storage_location, O_RDWR | O_CREAT, 0644); if (new_obj_reg->fd < 0) { PGOTO_ERROR(FAIL, "Failed to open file"); } diff --git a/src/tests/helper/julia_helper_loader.c b/src/tests/helper/julia_helper_loader.c index 56d255688..127f7c08a 100644 --- a/src/tests/helper/julia_helper_loader.c +++ b/src/tests/helper/julia_helper_loader.c @@ -8,13 +8,13 @@ jl_load_module(const char *mod_name) const char *julia_module_dir = getenv("PDC_JULIA_MODULE_DIR"); if (julia_module_dir == NULL || strlen(julia_module_dir) == 0) { // try to get it from PWD - LOG_WARNING("[PDC_JL_HELPER] Warning: PDC_JULIA_MODULE_DIR is not set, fallback to PWD!\n"); + LOG_WARNING("[PDC_JL_HELPER] PDC_JULIA_MODULE_DIR is not set, fallback to PWD!\n"); julia_module_dir = getenv("PWD"); } if (julia_module_dir == NULL || strlen(julia_module_dir) == 0) { // No way to find julia module directory - LOG_ERROR("[PDC_JL_HELPER] Error: Not able to find Julia module directory!\n"); + LOG_ERROR("[PDC_JL_HELPER] Not able to find Julia module directory!\n"); exit(-1); } LOG_INFO("[PDC_JL_HELPER] Julia module directory: %s\n", julia_module_dir); From e25e3ffe492ac573325ccc749bf8c277c87e171f Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 17 May 2025 14:22:43 -0700 Subject: [PATCH 36/43] update --- src/api/pdc_client_connect.c | 218 +++++++-------- src/server/pdc_client_server_common.c | 214 +++++++-------- .../pdc_server_region/pdc_server_data.c | 254 +++++++++--------- .../pdc_server_region_transfer.c | 10 +- 4 files changed, 348 insertions(+), 348 deletions(-) diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index 36a42451a..4bcbe480b 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -94,7 +94,7 @@ int pdc_nclient_per_server_g = 0; char pdc_client_tmp_dir_g[ADDR_MAX]; struct _pdc_server_info *pdc_server_info_g = NULL; -static int * debug_server_id_count = NULL; +static int *debug_server_id_count = NULL; int pdc_io_request_seq_id = PDC_SEQ_ID_INIT_VALUE; struct pdc_request *pdc_io_request_list_g = NULL; @@ -110,7 +110,7 @@ int nread_bb_g = 0; double read_bb_size_g = 0.0; static int mercury_has_init_g = 0; -static hg_class_t * send_class_g = NULL; +static hg_class_t *send_class_g = NULL; static hg_context_t *send_context_g = NULL; int query_id_g = 0; @@ -125,7 +125,7 @@ static hg_atomic_int32_t response_done_g; hg_atomic_int32_t bulk_transfer_done_g; // global variables for DART -static DART * dart_g; +static DART *dart_g; static dart_hash_algo_t dart_hash_algo_g = DART_HASH; static dart_object_ref_type_t dart_obj_ref_type_g = REF_PRIMARY_ID; @@ -389,8 +389,8 @@ PDC_Client_read_server_addr_from_file() perr_t ret_value = SUCCEED; int max_tries = 9, sleeptime = 1; int i = 0, is_server_ready = 0; - char * p; - FILE * na_config = NULL; + char *p; + FILE *na_config = NULL; char config_fname[PATH_MAX]; char n_server_string[PATH_MAX]; @@ -472,7 +472,7 @@ client_send_flush_obj_all_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; flush_obj_all_out_t output; - int * rpc_return; + int *rpc_return; FUNC_ENTER(NULL); @@ -528,7 +528,7 @@ client_send_flush_obj_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; flush_obj_out_t output; - int * rpc_return; + int *rpc_return; FUNC_ENTER(NULL); @@ -556,7 +556,7 @@ client_send_close_all_server_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; close_server_out_t output; - int * rpc_return; + int *rpc_return; FUNC_ENTER(NULL); @@ -940,7 +940,7 @@ PDC_Client_lookup_server(int server_id, int is_init) hg_return_t hg_ret; struct _pdc_client_lookup_args lookup_args; char self_addr[ADDR_MAX]; - char * target_addr_string; + char *target_addr_string; FUNC_ENTER(NULL); @@ -1215,14 +1215,14 @@ hg_test_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args; hg_bulk_t local_bulk_handle; uint32_t i; - void * buf = NULL; - void ** ids_buf; + void *buf = NULL; + void **ids_buf; uint32_t n_meta; uint64_t buf_sizes[2] = {0, 0}; - uint64_t * ids_buf_sizes; + uint64_t *ids_buf_sizes; uint32_t actual_cnt; - pdc_metadata_t * meta_ptr; - uint64_t * u64_arr_ptr; + pdc_metadata_t *meta_ptr; + uint64_t *u64_arr_ptr; uint32_t bulk_sgnum; FUNC_ENTER(NULL); @@ -1325,7 +1325,7 @@ PDC_Client_check_bulk(hg_context_t *hg_context) static const char * drc_strerror(int errnum) { - char * ret_value = NULL; + char *ret_value = NULL; const char *errstring = "UNDEFINED"; FUNC_ENTER(NULL); @@ -1363,13 +1363,13 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po * "cci+tcp" */ struct hg_init_info init_info = {0}; - char * default_hg_transport = "ofi+tcp"; - char * hg_transport; + char *default_hg_transport = "ofi+tcp"; + char *hg_transport; #ifdef PDC_HAS_CRAY_DRC uint32_t credential, cookie; drc_info_handle_t credential_info; char pdc_auth_key[256] = {'\0'}; - char * auth_key; + char *auth_key; int rc; #endif @@ -1564,7 +1564,7 @@ PDC_Client_init() { perr_t ret_value = SUCCEED; pdc_server_info_g = NULL; - char * tmp_dir; + char *tmp_dir; uint32_t port; int is_mpi_init = 0; @@ -1766,16 +1766,16 @@ static hg_return_t metadata_query_bulk_cb(const struct hg_cb_info *callback_info) { hg_return_t ret_value; - struct bulk_args_t * client_lookup_args; + struct bulk_args_t *client_lookup_args; hg_handle_t handle; metadata_query_transfer_out_t output; uint32_t n_meta; hg_op_id_t hg_bulk_op_id; hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; - const struct hg_info * hg_info = NULL; - struct bulk_args_t * bulk_args; - void * recv_meta; + const struct hg_info *hg_info = NULL; + struct bulk_args_t *bulk_args; + void *recv_meta; FUNC_ENTER(NULL); @@ -2185,7 +2185,7 @@ PDC_Client_add_tag(pdcid_t obj_id, const char *tag) hg_handle_t metadata_add_tag_handle; uint64_t meta_id; uint32_t server_id; - struct _pdc_obj_info * obj_prop; + struct _pdc_obj_info *obj_prop; struct _pdc_client_lookup_args lookup_args; metadata_add_tag_in_t in; @@ -2406,7 +2406,7 @@ PDC_Client_delete_metadata(char *delete_name, pdcid_t obj_delete_prop) { perr_t ret_value = SUCCEED; hg_return_t hg_ret = 0; - struct _pdc_obj_prop * delete_prop; + struct _pdc_obj_prop *delete_prop; metadata_delete_in_t in; int hash_name_value; uint32_t server_id; @@ -2466,7 +2466,7 @@ PDC_Client_query_metadata_name_only(const char *obj_name, pdc_metadata_t **out) struct _pdc_metadata_query_args **lookup_args; uint32_t server_id; uint32_t i, count = 0; - hg_handle_t * metadata_query_handle; + hg_handle_t *metadata_query_handle; FUNC_ENTER(NULL); @@ -2774,7 +2774,7 @@ PDC_Client_send_name_recv_id(const char *obj_name, uint64_t cont_id, pdcid_t obj perr_t ret_value = SUCCEED; hg_return_t hg_ret; uint32_t server_id = 0; - struct _pdc_obj_prop * create_prop = NULL; + struct _pdc_obj_prop *create_prop = NULL; gen_obj_id_in_t in; uint32_t hash_name_value; struct _pdc_client_lookup_args lookup_args; @@ -2935,7 +2935,7 @@ PDC_Client_close_all_server() if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "PDC_Client_close_all_server(): Could not destroy handle"); } // End pdc_client_mpi_rank_g < pdc_server_num_g - } // End pdc_client_mpi_size_g >= pdc_server_num_g + } // End pdc_client_mpi_size_g >= pdc_server_num_g else { if (pdc_client_mpi_rank_g == 0) { for (i = 0; i < (uint32_t)pdc_server_num_g; i++) { @@ -2964,7 +2964,7 @@ PDC_Client_close_all_server() PGOTO_ERROR(FAIL, "PDC_Client_close_all_server(): Could not destroy handle"); } } // End of mpi_rank == 0 - } // End pdc_client_mpi_size_g < pdc_server_num_g + } // End pdc_client_mpi_size_g < pdc_server_num_g #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -3147,7 +3147,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_all_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; int i; hg_handle_t client_send_transfer_request_all_handle; struct _pdc_transfer_request_all_args transfer_args; @@ -3273,7 +3273,7 @@ PDC_Client_transfer_request_metadata_query2(char *buf, uint64_t total_buf_size, perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_metadata_query2_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; hg_handle_t client_send_transfer_request_metadata_query2_handle; struct _pdc_transfer_request_metadata_query2_args transfer_args; @@ -3337,7 +3337,7 @@ PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, i perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_metadata_query_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; hg_handle_t client_send_transfer_request_metadata_query_handle; struct _pdc_transfer_request_metadata_query_args transfer_args; @@ -3402,7 +3402,7 @@ PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, u perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_wait_all_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; hg_handle_t client_send_transfer_request_wait_all_handle; struct _pdc_transfer_request_wait_all_args transfer_args; char cur_time[64]; @@ -3478,7 +3478,7 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_in_t in; - hg_class_t * hg_class; + hg_class_t *hg_class; uint32_t meta_server_id; hg_size_t total_data_size; int i; @@ -3714,12 +3714,12 @@ PDC_Client_buf_map(pdcid_t local_region_id, pdcid_t remote_obj_id, size_t ndim, hg_return_t hg_ret = HG_SUCCESS; buf_map_in_t in; uint32_t data_server_id, meta_server_id; - hg_class_t * hg_class; + hg_class_t *hg_class; hg_uint32_t i, j; hg_uint32_t local_count; - void ** data_ptrs = NULL; - size_t * data_size = NULL; + void **data_ptrs = NULL; + size_t *data_size = NULL; size_t unit, unit_to; struct _pdc_buf_map_args map_args; hg_handle_t client_send_buf_map_handle; @@ -4662,11 +4662,11 @@ PDC_Client_get_data_from_server_shm_cb(const struct hg_cb_info *callback_info) int shm_fd = -1; // file descriptor, from shm_open() uint32_t i = 0; - char * shm_base = NULL; // base address, from mmap() - char * shm_addr = NULL; + char *shm_base = NULL; // base address, from mmap() + char *shm_addr = NULL; uint64_t data_size = 1; - client_read_info_t * read_info = NULL; - struct pdc_request * elt = NULL; + client_read_info_t *read_info = NULL; + struct pdc_request *elt = NULL; struct pdc_region_info *target_region = NULL; #ifdef ENABLE_TIMING struct timeval pdc_timer_start; @@ -4698,7 +4698,7 @@ PDC_Client_get_data_from_server_shm_cb(const struct hg_cb_info *callback_info) } /* open the shared memory segment as if it was a file */ - shm_fd = shm_open(shm_addr, O_RDONLY, 0666); + shm_fd = shm_open(shm_addr, O_RDONLY, 0644); if (shm_fd == -1) PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: - Shared memory open failed [%s]!", pdc_client_mpi_rank_g, shm_addr); @@ -4757,8 +4757,8 @@ PDC_Client_data_server_read_check(int server_id, uint32_t client_id, pdc_metadat uint64_t read_size = 1; hg_handle_t data_server_read_check_handle; int shm_fd; // file descriptor, from shm_open() - char * shm_base; // base address, from mmap() - char * shm_addr; + char *shm_base; // base address, from mmap() + char *shm_addr; #ifdef ENABLE_TIMING struct timeval pdc_timer_start; struct timeval pdc_timer_end; @@ -4811,7 +4811,7 @@ PDC_Client_data_server_read_check(int server_id, uint32_t client_id, pdc_metadat shm_addr = lookup_args.ret_string; /* open the shared memory segment as if it was a file */ - shm_fd = shm_open(shm_addr, O_RDONLY, 0666); + shm_fd = shm_open(shm_addr, O_RDONLY, 0644); if (shm_fd == -1) PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: Shared memory open failed [%s]!", pdc_client_mpi_rank_g, shm_addr); @@ -4893,8 +4893,8 @@ PDC_Client_data_server_read(struct pdc_request *request) data_server_read_in_t in; hg_handle_t data_server_read_handle; int server_id, n_client, n_update; - pdc_metadata_t * meta; - struct pdc_region_info * region; + pdc_metadata_t *meta; + struct pdc_region_info *region; FUNC_ENTER(NULL); @@ -5026,8 +5026,8 @@ PDC_Client_data_server_write_check(struct pdc_request *request, int *status) data_server_write_check_in_t in; hg_handle_t data_server_write_check_handle; int server_id; - pdc_metadata_t * meta; - struct pdc_region_info * region; + pdc_metadata_t *meta; + struct pdc_region_info *region; uint64_t write_size = 1; uint32_t i; @@ -5128,9 +5128,9 @@ PDC_Client_data_server_write(struct pdc_request *request) int server_ret; hg_handle_t data_server_write_handle; int server_id, n_client, n_update; - pdc_metadata_t * meta; - struct pdc_region_info * region; - void * buf; + pdc_metadata_t *meta; + struct pdc_region_info *region; + void *buf; int rnd; #ifdef ENABLE_TIMING @@ -5172,7 +5172,7 @@ PDC_Client_data_server_write(struct pdc_request *request) rnd); /* create the shared memory segment as if it was a file */ - request->shm_fd = shm_open(request->shm_addr, O_CREAT | O_RDWR, 0666); + request->shm_fd = shm_open(request->shm_addr, O_CREAT | O_RDWR, 0644); if (request->shm_fd == -1) PGOTO_ERROR(FAIL, "==PDC_CLIENT: Shared memory creation with shm_open failed"); @@ -5186,7 +5186,7 @@ PDC_Client_data_server_write(struct pdc_request *request) request->shm_base = mmap(0, region_size, PROT_READ | PROT_WRITE, MAP_SHARED, request->shm_fd, 0); if (request->shm_base == MAP_FAILED) PGOTO_ERROR(FAIL, "==PDC_CLIENT: Shared memory mmap failed, region size = %" PRIu64 "", region_size); - // close and shm_unlink? + // close and shm_unlink? #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_start, 0); @@ -5398,7 +5398,7 @@ PDC_Client_write_id(pdcid_t local_obj_id, struct pdc_region_info *region, void * struct _pdc_id_info *info; struct _pdc_obj_info *object; - pdc_metadata_t * meta; + pdc_metadata_t *meta; perr_t ret_value = SUCCEED; FUNC_ENTER(NULL); @@ -5629,7 +5629,7 @@ PDC_Client_add_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdcid_t lo { perr_t ret_value = SUCCEED; int i; - uint64_t * obj_ids; + uint64_t *obj_ids; uint64_t cont_meta_id; struct _pdc_id_info *id_info = NULL; @@ -5655,7 +5655,7 @@ PDC_Client_del_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdcid_t lo { perr_t ret_value = SUCCEED; int i; - uint64_t * obj_ids; + uint64_t *obj_ids; uint64_t cont_meta_id; struct _pdc_id_info *id_info = NULL; @@ -5683,7 +5683,7 @@ PDC_Client_add_tags_to_container(pdcid_t cont_id, char *tags) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; uint32_t server_id; - struct _pdc_id_info * info; + struct _pdc_id_info *info; struct _pdc_cont_info *object; uint64_t cont_meta_id; cont_add_tags_rpc_in_t add_tag_rpc_in; @@ -5938,12 +5938,12 @@ PDC_Client_query_name_read_entire_obj(int nobj, char **obj_names, void ***out_bu hg_handle_t rpc_handle; hg_bulk_t bulk_handle; uint32_t server_id; - uint64_t * buf_sizes, total_size; + uint64_t *buf_sizes, total_size; int i; query_read_obj_name_in_t bulk_rpc_in; // Reuse the existing args structure update_region_storage_meta_bulk_args_t cb_args; - struct pdc_request * request; + struct pdc_request *request; FUNC_ENTER(NULL); @@ -6034,7 +6034,7 @@ PDC_Client_complete_read_request(int nbuf, struct pdc_request *req) for (i = 0; i < nbuf; i++) { /* open the shared memory segment as if it was a file */ - req->shm_fd_arr[i] = shm_open(req->shm_addr_arr[i], O_RDONLY, 0666); + req->shm_fd_arr[i] = shm_open(req->shm_addr_arr[i], O_RDONLY, 0644); if (req->shm_fd_arr[i] == -1) { LOG_ERROR("==PDC_CLIENT[%d]: Shared memory open failed [%s]!\n", pdc_client_mpi_rank_g, req->shm_addr_arr[i]); @@ -6230,7 +6230,7 @@ static region_list_t * PDC_get_storage_meta_from_io_list(pdc_data_server_io_list_t **list, region_storage_meta_t *storage_meta) { pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; - region_list_t * ret_value = NULL; + region_list_t *ret_value = NULL; FUNC_ENTER(NULL); @@ -6256,7 +6256,7 @@ PDC_add_storage_meta_to_io_list(pdc_data_server_io_list_t **list, region_storage { pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; - region_list_t * new_region; + region_list_t *new_region; int j; perr_t ret_value = SUCCEED; @@ -6323,7 +6323,7 @@ PDC_send_region_storage_meta_shm(uint32_t server_id, int n, region_storage_meta_ buf_sizes = n * sizeof(region_storage_meta_t); hg_ret = HG_Bulk_create(send_class_g, 1, (void **)&storage_meta, (const hg_size_t *)&buf_sizes, - HG_BULK_READ_ONLY, &bulk_handle); + HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create bulk data handle"); @@ -6356,7 +6356,7 @@ PDC_Client_cp_data_to_local_server(int nobj, region_storage_meta_t **all_storage perr_t ret_value = SUCCEED; uint32_t ndim, server_id; uint64_t total_size = 0, cp_loc = 0; - void * buf = NULL; + void *buf = NULL; char shm_addr[ADDR_MAX]; int i, *total_obj = NULL, ntotal_obj = nobj, *recvcounts = NULL, *displs = NULL; region_storage_meta_t *all_region_storage_meta_1d = NULL, *my_region_storage_meta_1d = NULL; @@ -6468,8 +6468,8 @@ PDC_Client_read_with_storage_meta(int nobj, region_storage_meta_t **all_storage_ { perr_t ret_value = SUCCEED; int i; - char * fname, *prev_fname; - FILE * fp_read = NULL; + char *fname, *prev_fname; + FILE *fp_read = NULL; uint32_t ndim; uint64_t req_start, req_count, storage_start, storage_count, file_offset, buf_size; size_t read_bytes; @@ -6570,15 +6570,15 @@ PDC_Client_query_multi_storage_info(int nobj, char **obj_names, region_storage_m hg_bulk_t bulk_handle; uint32_t server_id; - uint64_t * buf_sizes = NULL, total_size; + uint64_t *buf_sizes = NULL, total_size; int i, j, loc, iter, *n_obj_name_by_server = NULL; - int ** obj_names_server_seq_mapping = NULL, *obj_names_server_seq_mapping_1d; + int **obj_names_server_seq_mapping = NULL, *obj_names_server_seq_mapping_1d; int send_n_request = 0; - char *** obj_names_by_server = NULL; - char ** obj_names_by_server_2d = NULL; + char ***obj_names_by_server = NULL; + char **obj_names_by_server_2d = NULL; query_read_obj_name_in_t bulk_rpc_in; update_region_storage_meta_bulk_args_t cb_args; - struct pdc_request ** requests, *request; + struct pdc_request **requests, *request; FUNC_ENTER(NULL); @@ -6801,12 +6801,12 @@ PDC_Client_query_name_read_entire_obj_client_agg(int my_nobj, char **my_obj_name size_t *out_buf_sizes) { perr_t ret_value = SUCCEED; - char ** all_names = my_obj_names; - char * local_names_1d, *all_names_1d = NULL; - int * total_obj = NULL, i, ntotal_obj = my_nobj, *recvcounts = NULL, *displs = NULL; + char **all_names = my_obj_names; + char *local_names_1d, *all_names_1d = NULL; + int *total_obj = NULL, i, ntotal_obj = my_nobj, *recvcounts = NULL, *displs = NULL; size_t max_name_len = 64; region_storage_meta_t **all_storage_meta = NULL, **my_storage_meta = NULL; - region_storage_meta_t * my_storage_meta_1d = NULL, *res_storage_meta_1d = NULL; + region_storage_meta_t *my_storage_meta_1d = NULL, *res_storage_meta_1d = NULL; #ifdef ENABLE_TIMING struct timeval pdc_timer1; @@ -7096,7 +7096,7 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { if (is_client_debug_g == 1) { @@ -7167,8 +7167,8 @@ PDC_add_kvtag(pdcid_t obj_id, pdc_kvtag_t *kvtag, int is_cont) uint32_t server_id; hg_handle_t metadata_add_kvtag_handle; metadata_add_kvtag_in_t in; - struct _pdc_obj_info * obj_prop; - struct _pdc_cont_info * cont_prop; + struct _pdc_obj_info *obj_prop; + struct _pdc_cont_info *cont_prop; struct _pdc_client_lookup_args lookup_args; FUNC_ENTER(NULL); @@ -7275,8 +7275,8 @@ PDC_get_kvtag(pdcid_t obj_id, char *tag_name, pdc_kvtag_t **kvtag, int is_cont) hg_handle_t metadata_get_kvtag_handle; metadata_get_kvtag_in_t in; struct _pdc_get_kvtag_args lookup_args; - struct _pdc_obj_info * obj_prop; - struct _pdc_cont_info * cont_prop; + struct _pdc_obj_info *obj_prop; + struct _pdc_cont_info *cont_prop; FUNC_ENTER(NULL); @@ -7336,12 +7336,12 @@ kvtag_query_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_bulk_t origin_bulk_handle = hg_cb_info->info.bulk.origin_handle; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; uint32_t n_meta, actual_cnt; - void * buf = NULL; + void *buf = NULL; uint64_t buf_sizes[1]; uint32_t bulk_sgnum; - uint64_t * ids_buf_sizes; - void ** ids_buf; - uint64_t * u64_arr_ptr; + uint64_t *ids_buf_sizes; + void **ids_buf; + uint64_t *u64_arr_ptr; FUNC_ENTER(NULL); @@ -7394,14 +7394,14 @@ static hg_return_t kvtag_query_forward_cb(const struct hg_cb_info *callback_info) { hg_return_t ret_value; - struct bulk_args_t * bulk_arg; + struct bulk_args_t *bulk_arg; hg_handle_t handle; metadata_query_transfer_out_t output; uint32_t n_meta; hg_op_id_t hg_bulk_op_id; hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; - const struct hg_info * hg_info = NULL; + const struct hg_info *hg_info = NULL; FUNC_ENTER(NULL); @@ -7579,8 +7579,8 @@ PDCtag_delete(pdcid_t obj_id, char *tag_name, int is_cont) uint32_t server_id; hg_handle_t metadata_del_kvtag_handle; metadata_get_kvtag_in_t in; - struct _pdc_obj_info * obj_prop; - struct _pdc_cont_info * cont_prop; + struct _pdc_obj_info *obj_prop; + struct _pdc_cont_info *cont_prop; struct _pdc_client_lookup_args lookup_args; FUNC_ENTER(NULL); @@ -7822,7 +7822,7 @@ PDCobj_put_data(const char *obj_name, void *data, uint64_t size, pdcid_t cont_id perr_t ret; // pdc_metadata_t *meta; struct _pdc_cont_info *info = NULL; - struct _pdc_id_info * id_info = NULL; + struct _pdc_id_info *id_info = NULL; pdcid_t transfer_request; FUNC_ENTER(NULL); @@ -7928,7 +7928,7 @@ PDC_Client_del_metadata(pdcid_t obj_id, int is_cont) { perr_t ret_value = SUCCEED; uint64_t meta_id; - struct _pdc_obj_info * obj_prop; + struct _pdc_obj_info *obj_prop; struct _pdc_cont_info *cont_prop; FUNC_ENTER(NULL); @@ -8061,7 +8061,7 @@ hg_return_t PDC_recv_nhits(const struct hg_cb_info *callback_info) { hg_return_t ret_value = HG_SUCCESS; - send_nhits_t * in = (send_nhits_t *)callback_info->arg; + send_nhits_t *in = (send_nhits_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; FUNC_ENTER(NULL); @@ -8089,10 +8089,10 @@ PDC_send_data_query(pdc_query_t *query, pdc_query_get_op_t get_op, uint64_t *nhi { perr_t ret_value = SUCCEED; hg_return_t hg_ret = 0; - uint32_t * target_servers = NULL; + uint32_t *target_servers = NULL; int i, server_id, next_server = 0, prev_server = 0, ntarget = 0; hg_handle_t handle; - pdc_query_xfer_t * query_xfer; + pdc_query_xfer_t *query_xfer; struct _pdc_client_lookup_args lookup_args; struct _pdc_query_result_list *result; @@ -8180,12 +8180,12 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) { hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; uint64_t nhits = 0; uint32_t ndim; int query_id, origin; - void * buf; + void *buf; pdc_int_ret_t out; FUNC_ENTER(NULL); @@ -8266,7 +8266,7 @@ PDC_Client_get_sel_data(pdcid_t obj_id, pdc_selection_t *sel, void *data) uint64_t meta_id, off; get_sel_data_rpc_in_t in; struct _pdc_client_lookup_args lookup_args; - struct _pdc_obj_info * obj_prop; + struct _pdc_obj_info *obj_prop; struct _pdc_query_result_list *result_elt; FUNC_ENTER(NULL); @@ -8339,11 +8339,11 @@ PDC_recv_read_coords_data(const struct hg_cb_info *callback_info) { hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; uint64_t nhits = 0; int query_id, seq_id; - void * buf; + void *buf; pdc_int_ret_t out; FUNC_ENTER(NULL); @@ -8415,9 +8415,9 @@ report_avg_server_profiling_rst() { for (int i = 0; i < pdc_server_num_g; i++) { - double avg_srv_time = server_call_count_g[i] > 0 - ? (double)(server_time_total_g[i]) / (double)(server_call_count_g[i]) - : 0.0; + double avg_srv_time = server_call_count_g[i] > 0 + ? (double)(server_time_total_g[i]) / (double)(server_call_count_g[i]) + : 0.0; double srv_mem_usage = server_mem_usage_g[i] / 1024.0 / 1024.0; LOG_INFO("==PDC_CLIENT[%d]: server %d, avg profiling time: %.4f ms, memory usage: %.4f MB\n", pdc_client_mpi_rank_g, i, avg_srv_time / 1000.0, srv_mem_usage); @@ -8557,7 +8557,7 @@ static hg_return_t dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) { hg_return_t ret_value; - struct bulk_args_t * client_lookup_args; + struct bulk_args_t *client_lookup_args; hg_handle_t handle; dart_perform_one_server_out_t output; uint32_t n_meta; @@ -8566,8 +8566,8 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; const struct hg_info *hg_info = NULL; - struct bulk_args_t * bulk_args; - void * recv_meta; + struct bulk_args_t *bulk_args; + void *recv_meta; FUNC_ENTER(NULL); @@ -8739,7 +8739,7 @@ dart_perform_on_servers(index_hash_result_t **hash_result, int num_servers, { struct bulk_args_t *lookup_args = (struct bulk_args_t *)calloc(num_servers, sizeof(struct bulk_args_t)); uint64_t ret_value = 0; - hg_handle_t * dart_request_handles = (hg_handle_t *)calloc(num_servers, sizeof(hg_handle_t)); + hg_handle_t *dart_request_handles = (hg_handle_t *)calloc(num_servers, sizeof(hg_handle_t)); int num_requests = 0; uint32_t total_n_meta = 0; dart_op_type_t op_type = dart_in->op_type; @@ -8819,9 +8819,9 @@ PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char *query_s stopwatch_t timer; timer_start(&timer); - char * k_query = get_key(query_string, '='); - char * v_query = get_value(query_string, '='); - char * tok = NULL; + char *k_query = get_key(query_string, '='); + char *v_query = get_value(query_string, '='); + char *tok = NULL; dart_op_type_t dart_op; dart_determine_query_token_by_key_query(k_query, &tok, &dart_op); diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index 0d8faf999..ae5676c3e 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -1571,7 +1571,7 @@ HG_TEST_RPC_CB(metadata_query, handle) hg_return_t ret_value = HG_SUCCESS; metadata_query_in_t in; metadata_query_out_t out; - pdc_metadata_t * query_result = NULL; + pdc_metadata_t *query_result = NULL; FUNC_ENTER(NULL); @@ -1612,7 +1612,7 @@ HG_TEST_RPC_CB(obj_reset_dims, handle) hg_return_t ret_value = HG_SUCCESS; obj_reset_dims_in_t in; obj_reset_dims_out_t out; - pdc_metadata_t * query_result = NULL; + pdc_metadata_t *query_result = NULL; FUNC_ENTER(NULL); @@ -2000,7 +2000,7 @@ pdc_region_write_out_progress(void *arg) { HG_THREAD_RETURN_TYPE ret_value = (HG_THREAD_RETURN_TYPE)0; struct buf_map_release_bulk_args *bulk_args = (struct buf_map_release_bulk_args *)arg; - struct pdc_region_info * remote_reg_info = NULL; + struct pdc_region_info *remote_reg_info = NULL; region_lock_out_t out; FUNC_ENTER(NULL); @@ -2100,7 +2100,7 @@ pdc_region_read_from_progress(void *arg) { HG_THREAD_RETURN_TYPE ret_value = (HG_THREAD_RETURN_TYPE)0; struct buf_map_release_bulk_args *bulk_args = (struct buf_map_release_bulk_args *)arg; - const struct hg_info * hg_info = NULL; + const struct hg_info *hg_info = NULL; hg_return_t hg_ret; size_t size; int error = 0; @@ -2153,21 +2153,21 @@ transform_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_inf hg_return_t ret_value = HG_SUCCESS; region_lock_out_t out; struct buf_map_transform_and_release_bulk_args *bulk_args = NULL; - void * data_buf; - char * buf; + void *data_buf; + char *buf; int ndim; int transform_id; int type_extent = 0; int use_transform_size = 0; size_t unit = 1; int64_t transform_size, expected_size; - uint64_t * dims = NULL; + uint64_t *dims = NULL; pdc_var_type_t destType; - struct _pdc_region_transform_ftn_info ** registry = NULL; + struct _pdc_region_transform_ftn_info **registry = NULL; int registered_count; #ifdef ENABLE_MULTITHREAD data_server_region_t *target_reg = NULL; - region_buf_map_t * elt; + region_buf_map_t *elt; #else struct pdc_region_info *remote_reg_info = NULL; #endif @@ -2338,12 +2338,12 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info hg_return_t ret_value = HG_SUCCESS; region_lock_out_t out; struct buf_map_analysis_and_release_bulk_args *bulk_args = NULL; - void * data_buf; + void *data_buf; int ndim; uint64_t type_extent; - uint64_t * dims = NULL; - struct pdc_region_info * remote_reg_info = NULL; - struct pdc_region_info * local_reg_info = NULL; + uint64_t *dims = NULL; + struct pdc_region_info *remote_reg_info = NULL; + struct pdc_region_info *local_reg_info = NULL; double start_t, end_t, analysis_t, io_t; double averages[4]; @@ -2396,7 +2396,7 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info int registered_count = PDC_get_analysis_registry(®istry); if ((registered_count >= analysis_meta_index) && (registry != NULL)) { - int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t * _cbs) = + int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t *_cbs) = registry[analysis_meta_index]->ftnPtr; int result = analysis_ftn(bulk_args->in.input_iter, bulk_args->in.output_iter, &iter_cbs); LOG_INFO("==PDC_SERVER: Analysis returned %d\n", result); @@ -2495,7 +2495,7 @@ buf_map_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) struct buf_map_release_bulk_args *bulk_args = NULL; #ifdef ENABLE_MULTITHREAD data_server_region_t *target_reg = NULL; - region_buf_map_t * elt; + region_buf_map_t *elt; #else struct pdc_region_info *remote_reg_info = NULL; #endif @@ -2680,23 +2680,23 @@ HG_TEST_RPC_CB(region_release, handle) hg_return_t hg_ret; region_lock_in_t in; region_lock_out_t out; - const struct hg_info * hg_info = NULL; - data_server_region_t * target_obj = NULL; + const struct hg_info *hg_info = NULL; + data_server_region_t *target_obj = NULL; int error = 0; int dirty_reg = 0; hg_size_t size, size2; - void * data_buf; - struct pdc_region_info * server_region; - region_list_t * elt = NULL, *request_region = NULL, *tmp = NULL, *elt_tmp = NULL; + void *data_buf; + struct pdc_region_info *server_region; + region_list_t *elt = NULL, *request_region = NULL, *tmp = NULL, *elt_tmp = NULL; struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; - struct buf_map_release_bulk_args * buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; + struct buf_map_release_bulk_args *buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info * remote_reg_info = NULL; - region_buf_map_t * eltt = NULL, *eltt2 = NULL, *eltt_tmp = NULL; + struct pdc_region_info *remote_reg_info = NULL; + region_buf_map_t *eltt = NULL, *eltt2 = NULL, *eltt_tmp = NULL; hg_uint32_t remote_count; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; #ifdef PDC_TIMING double start, end; #endif @@ -3034,10 +3034,10 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha const struct hg_info *hg_info = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; hg_uint32_t remote_count; - void * data_buf = NULL; + void *data_buf = NULL; ; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; region_buf_map_t *eltt2; region_lock_out_t out; @@ -3046,8 +3046,8 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha int dirty_reg = 0; struct buf_map_transform_and_release_bulk_args *transform_release_bulk_args = NULL; - struct pdc_region_info * remote_reg_info = NULL; - data_server_region_t * target_obj = NULL; + struct pdc_region_info *remote_reg_info = NULL; + data_server_region_t *target_obj = NULL; region_list_t *tmp, *elt, *request_region = (region_list_t *)malloc(sizeof(region_list_t)); FUNC_ENTER(NULL); @@ -3199,19 +3199,19 @@ HG_TEST_RPC_CB(transform_region_release, handle) region_transform_and_lock_in_t in; region_lock_in_t reg_lock_in; region_lock_out_t out; - const struct hg_info * hg_info = NULL; - data_server_region_t * target_obj; + const struct hg_info *hg_info = NULL; + data_server_region_t *target_obj; int error = 0; int dirty_reg = 0; hg_size_t size; - void * data_buf; - region_list_t * elt, *request_region, *tmp; + void *data_buf; + region_list_t *elt, *request_region, *tmp; struct buf_map_transform_and_release_bulk_args *buf_map_bulk_args = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - region_buf_map_t * eltt; + region_buf_map_t *eltt; hg_uint32_t remote_count; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; FUNC_ENTER(NULL); @@ -3347,14 +3347,14 @@ HG_TEST_RPC_CB(region_transform_release, handle) int dirty_reg = 0; hg_size_t size, remote_size; ; - void * data_buf; - region_list_t * elt, *request_region, *tmp; + void *data_buf; + region_list_t *elt, *request_region, *tmp; struct buf_map_release_bulk_args *buf_map_bulk_args = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - region_buf_map_t * eltt; + region_buf_map_t *eltt; hg_uint32_t k, remote_count = 0; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; size_t type_size = 0; ; size_t dims[4] = {0, 0, 0, 0}; @@ -3506,26 +3506,26 @@ HG_TEST_RPC_CB(region_analysis_release, handle) } in; region_lock_out_t out; - const struct hg_info * hg_info = NULL; - data_server_region_t * target_obj; - data_server_region_t * lock_obj; + const struct hg_info *hg_info = NULL; + data_server_region_t *target_obj; + data_server_region_t *lock_obj; int error = 0; int dirty_reg = 0; hg_size_t size; hg_return_t hg_ret; - void * data_buf; - struct pdc_region_info * server_region; - region_list_t * elt, *request_region, *tmp; - struct region_lock_update_bulk_args * lock_update_bulk_args = NULL; + void *data_buf; + struct pdc_region_info *server_region; + region_list_t *elt, *request_region, *tmp; + struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; struct buf_map_analysis_and_release_bulk_args *buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info * remote_reg_info; - region_buf_map_t * eltt, *eltt2; + struct pdc_region_info *remote_reg_info; + region_buf_map_t *eltt, *eltt2; hg_uint32_t k, remote_count = 0; - void ** data_ptrs_to = NULL; - size_t * data_size_to = NULL; + void **data_ptrs_to = NULL; + size_t *data_size_to = NULL; size_t type_size = 0; size_t dims[4] = {0, 0, 0, 0}; @@ -3959,7 +3959,7 @@ HG_TEST_RPC_CB(get_remote_metadata, handle) hg_return_t ret_value = HG_SUCCESS; get_remote_metadata_in_t in; get_remote_metadata_out_t out; - pdc_metadata_t * meta; + pdc_metadata_t *meta; FUNC_ENTER(NULL); @@ -3994,7 +3994,7 @@ HG_TEST_RPC_CB(buf_unmap_server, handle) hg_return_t ret_value = HG_SUCCESS; buf_unmap_in_t in; buf_unmap_out_t out; - pdc_metadata_t * target_obj; + pdc_metadata_t *target_obj; region_buf_map_t *tmp, *elt; FUNC_ENTER(NULL); @@ -4043,8 +4043,8 @@ HG_TEST_RPC_CB(buf_map_server, handle) hg_return_t ret_value = HG_SUCCESS; buf_map_in_t in; buf_map_out_t out; - pdc_metadata_t * target_obj; - region_list_t * elt, *request_region; + pdc_metadata_t *target_obj; + region_list_t *elt, *request_region; region_buf_map_t *buf_map_ptr; FUNC_ENTER(NULL); @@ -4108,9 +4108,9 @@ HG_TEST_RPC_CB(buf_map, handle) buf_map_in_t in; buf_map_out_t out; const struct hg_info *info; - region_list_t * request_region; - region_buf_map_t * new_buf_map_ptr = NULL; - void * data_ptr; + region_list_t *request_region; + region_buf_map_t *new_buf_map_ptr = NULL; + void *data_ptr; size_t ndim; #ifdef PDC_TIMING double start, end; @@ -4175,9 +4175,9 @@ HG_TEST_RPC_CB(query_partial, handle) hg_return_t hg_ret; hg_bulk_t bulk_handle = HG_BULK_NULL; uint32_t i; - void ** buf_ptrs; - size_t * buf_sizes; - uint32_t * n_meta_ptr, n_buf; + void **buf_ptrs; + size_t *buf_sizes; + uint32_t *n_meta_ptr, n_buf; metadata_query_transfer_in_t in; metadata_query_transfer_out_t out; @@ -4270,7 +4270,7 @@ HG_TEST_RPC_CB(query_kvtag, handle) hg_return_t ret_value; hg_return_t hg_ret; hg_bulk_t bulk_handle = HG_BULK_NULL; - uint64_t * buf_ptr; + uint64_t *buf_ptr; size_t buf_size[1]; uint32_t nmeta; pdc_kvtag_t in; @@ -4331,10 +4331,10 @@ update_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int cnt, i; - uint64_t * obj_id_ptr; + uint64_t *obj_id_ptr; pdc_int_ret_t out_struct; - void ** buf; - void * buf_1d; + void **buf; + void *buf_1d; FUNC_ENTER(NULL); @@ -4390,7 +4390,7 @@ HG_TEST_RPC_CB(bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; bulk_rpc_in_t in_struct; int cnt; @@ -4538,7 +4538,7 @@ HG_TEST_RPC_CB(data_server_read_check, handle) // Decode input data_server_read_check_in_t in; data_server_read_check_out_t out; - server_read_check_out_t * read_out = calloc(1, sizeof(server_read_check_out_t)); + server_read_check_out_t *read_out = calloc(1, sizeof(server_read_check_out_t)); FUNC_ENTER(NULL); @@ -4640,7 +4640,7 @@ HG_TEST_RPC_CB(get_metadata_by_id, handle) hg_return_t ret_value = HG_SUCCESS; get_metadata_by_id_in_t in; get_metadata_by_id_out_t out; - pdc_metadata_t * target = NULL; + pdc_metadata_t *target = NULL; FUNC_ENTER(NULL); @@ -4746,8 +4746,8 @@ char * PDC_find_in_path(char *workingDir, char *application) { struct stat fileStat; - char * ret_value = NULL; - char * pathVar = getenv("PATH"); + char *ret_value = NULL; + char *pathVar = getenv("PATH"); char colon = ':'; char checkPath[PATH_MAX]; @@ -4802,11 +4802,11 @@ cont_add_del_objs_bulk_cb(const struct hg_cb_info *hg_cb_info) { hg_return_t ret_value = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int cnt, op; cont_add_del_objs_rpc_out_t out_struct; - uint64_t * obj_ids, cont_id; + uint64_t *obj_ids, cont_id; FUNC_ENTER(NULL); @@ -4857,8 +4857,8 @@ cont_add_del_objs_bulk_cb(const struct hg_cb_info *hg_cb_info) HG_TEST_RPC_CB(cont_add_del_objs_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; - const struct hg_info * hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + const struct hg_info *hg_info = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; cont_add_del_objs_rpc_in_t in_struct; @@ -4938,13 +4938,13 @@ query_read_obj_name_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; hg_return_t ret = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int iter; size_t i; - char * tmp_buf; + char *tmp_buf; query_read_obj_name_out_t out_struct; - query_read_names_args_t * query_read_names_args; + query_read_names_args_t *query_read_names_args; FUNC_ENTER(NULL); @@ -5000,8 +5000,8 @@ HG_TEST_RPC_CB(query_read_obj_name_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; hg_return_t ret = HG_SUCCESS; - const struct hg_info * hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + const struct hg_info *hg_info = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; query_read_obj_name_in_t in_struct; @@ -5109,13 +5109,13 @@ get_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int i, task_id, n_regions; - int * int_ptr; - char * char_ptr, *file_path; - uint64_t * uint64_ptr, offset; + int *int_ptr; + char *char_ptr, *file_path; + uint64_t *uint64_ptr, offset; - void * buf; + void *buf; region_info_transfer_t *region_info_ptr; - region_list_t * region_list, *region_list_head = NULL; + region_list_t *region_list, *region_list_head = NULL; pdc_int_ret_t out_struct; FUNC_ENTER(NULL); @@ -5185,7 +5185,7 @@ HG_TEST_RPC_CB(get_storage_meta_name_query_bulk_result_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; const struct hg_info *hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; bulk_rpc_in_t in_struct; @@ -5238,8 +5238,8 @@ notify_client_multi_io_complete_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int n_shm; - void * buf; - char * buf_cp; + void *buf; + char *buf_cp; pdc_int_ret_t out_struct; FUNC_ENTER(NULL); @@ -5282,7 +5282,7 @@ HG_TEST_RPC_CB(notify_client_multi_io_complete_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; const struct hg_info *hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; bulk_rpc_in_t in_struct; @@ -5325,7 +5325,7 @@ PDC_add_task_to_list(pdc_task_list_t **target_list, perr_t (*cb)(), void *cb_arg #ifdef ENABLE_MULTITHREAD void *_mutex) #else - void *_mutex ATTRIBUTE(unused)) + void *_mutex ATTRIBUTE(unused)) #endif { int ret_value = 0; @@ -5369,7 +5369,7 @@ PDC_del_task_from_list(pdc_task_list_t **target_list, pdc_task_list_t *del, #ifdef ENABLE_MULTITHREAD void *_mutex) #else - void *_mutex ATTRIBUTE(unused)) + void *_mutex ATTRIBUTE(unused)) #endif { perr_t ret_value = SUCCEED; @@ -5553,13 +5553,13 @@ query_read_obj_name_client_bulk_cb(const struct hg_cb_info *hg_cb_info) { hg_return_t ret_value = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int iter; size_t i; - char * tmp_buf; + char *tmp_buf; query_read_obj_name_out_t out_struct; - query_read_names_args_t * query_read_names_args; + query_read_names_args_t *query_read_names_args; FUNC_ENTER(NULL); @@ -5615,8 +5615,8 @@ query_read_obj_name_client_bulk_cb(const struct hg_cb_info *hg_cb_info) HG_TEST_RPC_CB(query_read_obj_name_client_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; - const struct hg_info * hg_info = NULL; - struct bulk_args_t * bulk_args = NULL; + const struct hg_info *hg_info = NULL; + struct bulk_args_t *bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; query_read_obj_name_in_t in_struct; @@ -5666,9 +5666,9 @@ static hg_return_t send_client_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) { hg_return_t ret_value = HG_SUCCESS; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; - void * buf = NULL, *buf_cp = NULL; + void *buf = NULL, *buf_cp = NULL; process_bulk_storage_meta_args_t *process_args = NULL; FUNC_ENTER(NULL); @@ -5713,7 +5713,7 @@ HG_TEST_RPC_CB(send_client_storage_meta_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; bulk_rpc_in_t in_struct; pdc_int_ret_t out_struct; int cnt; @@ -5773,7 +5773,7 @@ server_recv_shm_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; - void * buf = NULL, *buf_cp = NULL; + void *buf = NULL, *buf_cp = NULL; FUNC_ENTER(NULL); @@ -5810,7 +5810,7 @@ HG_TEST_RPC_CB(send_shm_bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t * bulk_args = NULL; + struct bulk_args_t *bulk_args = NULL; bulk_rpc_in_t in_struct; pdc_int_ret_t out_struct; int cnt; @@ -5978,7 +5978,7 @@ HG_TEST_RPC_CB(send_bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t * bulk_arg = NULL; + struct bulk_args_t *bulk_arg = NULL; bulk_rpc_in_t in_struct; hg_return_t (*func_ptr)(const struct hg_cb_info *hg_cb_info); struct hg_cb_info callback_info; @@ -6077,10 +6077,10 @@ HG_TEST_RPC_CB(dart_perform_one_server, handle) dart_perform_one_server_out_t out; hg_bulk_t bulk_handle = HG_BULK_NULL; - uint64_t * n_obj_ids_ptr; + uint64_t *n_obj_ids_ptr; uint64_t n_buf; uint64_t **buf_ptrs; - size_t * buf_sizes; + size_t *buf_sizes; uint32_t i; FUNC_ENTER(NULL); @@ -6524,7 +6524,7 @@ PDC_create_shm_segment_ind(uint64_t size, char *shm_addr, void **buf) srand(time(0)); while (retry < PDC_MAX_TRIAL_NUM) { snprintf(shm_addr, ADDR_MAX, "/PDCshm%d", rand()); - shm_fd = shm_open(shm_addr, O_CREAT | O_RDWR, 0666); + shm_fd = shm_open(shm_addr, O_CREAT | O_RDWR, 0644); if (shm_fd != -1) break; retry++; @@ -6564,7 +6564,7 @@ PDC_create_shm_segment(region_list_t *region) /* create the shared memory segment as if it was a file */ retry = 0; while (retry < PDC_MAX_TRIAL_NUM) { - region->shm_fd = shm_open(region->shm_addr, O_CREAT | O_RDWR, 0666); + region->shm_fd = shm_open(region->shm_addr, O_CREAT | O_RDWR, 0644); if (region->shm_fd != -1) break; retry++; diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index fbbcde4af..cb6710612 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -62,7 +62,7 @@ #include "pdc_logger.h" // Global object region info list in local data server -data_server_region_t * dataserver_region_g = NULL; +data_server_region_t *dataserver_region_g = NULL; data_server_region_unmap_t *dataserver_region_unmap = NULL; int pdc_buffered_bulk_update_total_g = 0; @@ -79,10 +79,10 @@ uint64_t max_mem_cache_size_mb_g = 0; int cache_percentage_g = 0; int current_read_from_cache_cnt_g = 0; int total_read_from_cache_cnt_g = 0; -FILE * pdc_cache_file_ptr_g = NULL; +FILE *pdc_cache_file_ptr_g = NULL; char pdc_cache_file_path_g[ADDR_MAX]; -query_task_t * query_task_list_head_g = NULL; +query_task_t *query_task_list_head_g = NULL; cache_storage_region_t *cache_storage_region_head_g = NULL; static int @@ -126,7 +126,7 @@ static int server_open_storage(char *storage_location, pdcid_t obj_id) { fill_storage_path(storage_location, obj_id); - return open(storage_location, O_RDWR | O_CREAT, 0666); + return open(storage_location, O_RDWR | O_CREAT, 0644); } /* @@ -263,7 +263,7 @@ PDC_Server_local_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock { perr_t ret_value = SUCCEED; pdc_metadata_t *res_meta; - region_list_t * elt, *request_region; + region_list_t *elt, *request_region; FUNC_ENTER(NULL); @@ -364,7 +364,7 @@ PDC_Server_clear_obj_region() { perr_t ret_value = SUCCEED; data_server_region_t *elt, *tmp; - region_list_t * elt2, *tmp2; + region_list_t *elt2, *tmp2; FUNC_ENTER(NULL); if (dataserver_region_g != NULL) { @@ -473,10 +473,10 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han { perr_t ret_value = SUCCEED; int ndim; - region_list_t * request_region; + region_list_t *request_region; data_server_region_t *new_obj_reg; - region_list_t * elt1, *tmp; - region_buf_map_t * eltt; + region_list_t *elt1, *tmp; + region_buf_map_t *eltt; int error = 0; int found_lock = 0; // time_t t; @@ -577,8 +577,8 @@ perr_t PDC_Server_release_lock_request(uint64_t obj_id, struct pdc_region_info *region) { perr_t ret_value = SUCCEED; - region_list_t * request_region; - region_list_t * elt, *tmp; + region_list_t *request_region; + region_list_t *elt, *tmp; data_server_region_t *new_obj_reg; region_lock_out_t out; @@ -620,7 +620,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) { perr_t ret_value = SUCCEED; int ndim; - region_list_t * tmp1, *tmp2; + region_list_t *tmp1, *tmp2; region_list_t request_region; int found = 0; data_server_region_t *obj_reg = NULL; @@ -759,7 +759,7 @@ PDC_Data_Server_buf_unmap(const struct hg_info *info, buf_unmap_in_t *in) { perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; - region_buf_map_t * tmp, *elt; + region_buf_map_t *tmp, *elt; data_server_region_t *target_obj; FUNC_ENTER(NULL); @@ -853,9 +853,9 @@ PDC_Data_Server_check_unmap() perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; pdcid_t remote_obj_id; - region_buf_map_t * tmp, *elt; + region_buf_map_t *tmp, *elt; data_server_region_unmap_t *tmp1, *elt1; - data_server_region_t * target_obj; + data_server_region_t *target_obj; int completed = 0; FUNC_ENTER(NULL); @@ -954,7 +954,7 @@ buf_unmap_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_unmap_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_unmap_handle; hg_handle_t handle; - struct transfer_buf_unmap * tranx_args; + struct transfer_buf_unmap *tranx_args; int error = 0; FUNC_ENTER(NULL); @@ -1018,7 +1018,7 @@ PDC_Server_buf_unmap_lookup_server_id(int remote_server_id, struct transfer_buf_ lookup_args->server_id = remote_server_id; lookup_args->buf_unmap_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_unmap_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR( @@ -1078,9 +1078,9 @@ PDC_Meta_Server_buf_unmap(buf_unmap_in_t *in, hg_handle_t *handle) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_unmap_handle; struct transfer_buf_unmap_args *buf_unmap_args; - struct transfer_buf_unmap * addr_args; - pdc_metadata_t * target_meta = NULL; - region_buf_map_t * tmp, *elt; + struct transfer_buf_unmap *addr_args; + pdc_metadata_t *target_meta = NULL; + region_buf_map_t *tmp, *elt; int error = 0; FUNC_ENTER(NULL); @@ -1154,14 +1154,14 @@ region_buf_map_t * PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_list_t *request_region, void *data_ptr) { - region_buf_map_t * ret_value = NULL; + region_buf_map_t *ret_value = NULL; data_server_region_t *new_obj_reg = NULL; - region_list_t * elt_reg; - region_buf_map_t * buf_map_ptr = NULL; - region_buf_map_t * tmp; + region_list_t *elt_reg; + region_buf_map_t *buf_map_ptr = NULL; + region_buf_map_t *tmp; int dup = 0; - char * data_path = NULL; - char * user_specified_data_path = NULL; + char *data_path = NULL; + char *user_specified_data_path = NULL; char storage_location[ADDR_MAX]; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; @@ -1211,7 +1211,7 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis LOG_INFO("storage_location is %s\n", storage_location); } #endif - new_obj_reg->fd = open(storage_location, O_RDWR | O_CREAT, 0666); + new_obj_reg->fd = open(storage_location, O_RDWR | O_CREAT, 0644); if (new_obj_reg->fd == -1) { LOG_ERROR("==PDC_SERVER[%d]: open %s failed\n", pdc_server_rank_g, storage_location); goto done; @@ -1277,9 +1277,9 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis void * PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region, size_t type_size) { - void * ret_value = NULL; + void *ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t * tmp; + region_buf_map_t *tmp; FUNC_ENTER(NULL); @@ -1331,9 +1331,9 @@ PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t void * PDC_Server_get_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region) { - void * ret_value = NULL; + void *ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t * tmp; + region_buf_map_t *tmp; FUNC_ENTER(NULL); @@ -1399,7 +1399,7 @@ buf_map_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_map_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_map_handle; hg_handle_t handle; - struct transfer_buf_map * tranx_args; + struct transfer_buf_map *tranx_args; int error = 0; FUNC_ENTER(NULL); @@ -1463,7 +1463,7 @@ PDC_Server_buf_map_lookup_server_id(int remote_server_id, struct transfer_buf_ma lookup_args->server_id = remote_server_id; lookup_args->buf_map_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_map_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR( @@ -1519,9 +1519,9 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_map_handle; struct transfer_buf_map_args *tranx_args = NULL; - struct transfer_buf_map * addr_args; - pdc_metadata_t * target_meta = NULL; - region_buf_map_t * buf_map_ptr; + struct transfer_buf_map *addr_args; + pdc_metadata_t *target_meta = NULL; + region_buf_map_t *buf_map_ptr; int error = 0; FUNC_ENTER(NULL); @@ -1794,11 +1794,11 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; - void ** buf_ptrs; - hg_size_t * buf_sizes; + void **buf_ptrs; + hg_size_t *buf_sizes; bulk_rpc_in_t bulk_rpc_in; int i; - region_list_t * region_elt; + region_list_t *region_elt; notify_multi_io_args_t *bulk_args; FUNC_ENTER(NULL); @@ -2007,7 +2007,7 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * { perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t * region_elt = NULL; + region_list_t *region_elt = NULL; region_list_t r_target; /* uint32_t i; */ @@ -2093,7 +2093,7 @@ PDC_Server_write_check(data_server_write_check_in_t *in, data_server_write_check { perr_t ret_value = FAIL; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t * region_elt = NULL, *region_tmp = NULL; + region_list_t *region_elt = NULL, *region_tmp = NULL; int found_region = 0; FUNC_ENTER(NULL); @@ -2201,7 +2201,7 @@ PDC_Server_get_local_storage_location_of_region(uint64_t obj_id, region_list_t * { perr_t ret_value = SUCCEED; pdc_metadata_t *target_meta = NULL; - region_list_t * region_elt = NULL; + region_list_t *region_elt = NULL; FUNC_ENTER(NULL); @@ -2328,7 +2328,7 @@ PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_cb_info *cal } } // end of if - } // end of if (write_ret->ret == 1) + } // end of if (write_ret->ret == 1) done: @@ -2360,17 +2360,17 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) perr_t ret_value = SUCCEED; uint32_t server_id = 0; uint32_t i, j; - pdc_metadata_t * region_meta = NULL, *region_meta_prev = NULL; - region_list_t * region_elt, req_region, **overlap_regions_2d = NULL; + pdc_metadata_t *region_meta = NULL, *region_meta_prev = NULL; + region_list_t *region_elt, req_region, **overlap_regions_2d = NULL; region_info_transfer_t local_region_transfer[PDC_SERVER_MAX_PROC_PER_NODE]; - region_info_transfer_t * all_requests = NULL; + region_info_transfer_t *all_requests = NULL; update_region_storage_meta_bulk_t *send_buf = NULL; update_region_storage_meta_bulk_t *result_storage_meta = NULL; uint32_t total_request_cnt; int data_size = sizeof(region_info_transfer_t); - int * send_bytes = NULL; - int * displs = NULL; - int * request_overlap_cnt = NULL; + int *send_bytes = NULL; + int *displs = NULL; + int *request_overlap_cnt = NULL; int nrequest_per_server = 0; FUNC_ENTER(NULL); @@ -2655,7 +2655,7 @@ PDC_Server_data_write_from_shm(region_list_t *region_list_head) region_elt->data_size = PDC_get_region_size(region_elt); // Open shared memory and map to data buf - region_elt->shm_fd = shm_open(region_elt->shm_addr, O_RDONLY, 0666); + region_elt->shm_fd = shm_open(region_elt->shm_addr, O_RDONLY, 0644); if (region_elt->shm_fd == -1) { LOG_ERROR("==PDC_SERVER[%d]: Shared memory open failed [%s]!\n", pdc_server_rank_g, region_elt->shm_addr); @@ -2698,7 +2698,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_list_elt, *io_list = NULL, *io_list_target = NULL; - region_list_t * region_elt = NULL, *region_tmp; + region_list_t *region_elt = NULL, *region_tmp; int real_bb_cnt = 0, real_lustre_cnt = 0; int write_to_bb_cnt = 0; int count; @@ -3100,7 +3100,7 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) hg_return_t hg_ret; perr_t ret_value = SUCCEED; uint32_t server_id = 0; - pdc_metadata_t * region_meta = NULL; + pdc_metadata_t *region_meta = NULL; hg_handle_t update_region_loc_handle; update_region_loc_in_t in; server_lookup_args_t lookup_args; @@ -3202,7 +3202,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ int i; uint64_t obj_id = 0; update_region_storage_meta_bulk_t *curr_buf_ptr; - uint64_t * obj_id_ptr; + uint64_t *obj_id_ptr; FUNC_ENTER(NULL); @@ -3292,8 +3292,8 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk { perr_t ret_value = SUCCEED; int i; - pdc_metadata_t * target_meta = NULL; - region_list_t * region_elt = NULL, *new_region = NULL; + pdc_metadata_t *target_meta = NULL; + region_list_t *region_elt = NULL, *new_region = NULL; update_region_storage_meta_bulk_t *bulk_ptr; int update_success = 0, express_insert = 0; uint64_t obj_id; @@ -3416,7 +3416,7 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) int i; uint32_t server_id = 0; update_region_storage_meta_bulk_t *recv_buf = NULL; - void ** all_meta = NULL; + void **all_meta = NULL; #endif FUNC_ENTER(NULL); @@ -3469,9 +3469,9 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) } perr_t -PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * bulk_data, perr_t (*cb)(), +PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t *bulk_data, perr_t (*cb)(), update_storage_meta_list_t *meta_list_target, - int * n_updated) + int *n_updated) { hg_return_t hg_ret; perr_t ret_value = SUCCEED; @@ -3712,7 +3712,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re } *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { uint64_t buf_serialize_offset; /* fseek (fp, storage_offset, SEEK_SET); */ @@ -3795,8 +3795,8 @@ PDC_Server_read_one_region(region_list_t *read_region) size_t total_read_bytes = 0; uint32_t n_storage_regions = 0; region_list_t *region_elt; - FILE * fp_read = NULL; - char * prev_path = NULL; + FILE *fp_read = NULL; + char *prev_path = NULL; int is_shm_created = 0, is_read_succeed = 0; #ifdef ENABLE_TIMING double fopen_time; @@ -3939,8 +3939,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) uint64_t offset = 0; uint32_t i = 0; region_list_t *region_elt = NULL, *previous_region = NULL; - FILE * fp_read = NULL, *fp_write = NULL; - char * prev_path = NULL; + FILE *fp_read = NULL, *fp_write = NULL; + char *prev_path = NULL; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; #endif @@ -4400,11 +4400,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, { perr_t ret_value = SUCCEED; data_server_region_t *region = NULL; - region_list_t * overlap_region = NULL; + region_list_t *overlap_region = NULL; int is_contained = 0; uint64_t i, j, pos; - uint64_t * overlap_offset, *overlap_size; - char * tmp_buf; + uint64_t *overlap_offset, *overlap_size; + char *tmp_buf; #if 0 size_t total_write_size = 0, local_write_size; int is_overlap; @@ -4688,11 +4688,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, if (is_contained == 0) { request_region->offset = lseek(region->fd, 0, SEEK_END); #ifdef ENABLE_ZFP - zfp_field * field; + zfp_field *field; zfp_stream *zfp; size_t bufsize; - void * buffer; - bitstream * stream; + void *buffer; + bitstream *stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -4766,10 +4766,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, perr_t ret_value = SUCCEED; ssize_t request_bytes = unit; data_server_region_t *region = NULL; - region_list_t * elt; + region_list_t *elt; uint64_t i, j, pos; - uint64_t * overlap_offset, *overlap_size; - char * tmp_buf; + uint64_t *overlap_offset, *overlap_size; + char *tmp_buf; FUNC_ENTER(NULL); #ifdef PDC_TIMING @@ -4867,10 +4867,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef ENABLE_ZFP // Uncompress the data - zfp_field * field; + zfp_field *field; zfp_stream *zfp; size_t bufsize, decompress_size; - bitstream * stream; + bitstream *stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -5131,7 +5131,7 @@ PDC_Server_get_local_storage_meta_with_one_name(storage_meta_query_one_name_args { perr_t ret_value = SUCCEED; pdc_metadata_t *meta = NULL; - region_list_t * region_elt = NULL, *region_head = NULL, *res_region_list = NULL; + region_list_t *region_elt = NULL, *region_head = NULL, *res_region_list = NULL; int region_count = 0, i = 0; FUNC_ENTER(NULL); @@ -5263,7 +5263,7 @@ PDC_Server_accumulate_storage_meta_then_read(storage_meta_query_one_name_args_t { perr_t ret_value = SUCCEED; accumulate_storage_meta_t *accu_meta; - region_list_t * req_region = NULL, *region_elt = NULL, *read_list_head = NULL; + region_list_t *req_region = NULL, *region_elt = NULL, *read_list_head = NULL; int i, is_sort_read; size_t j; @@ -5431,16 +5431,16 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac { hg_return_t hg_ret = HG_SUCCESS; perr_t ret_value; - storage_meta_name_query_in_t * args; + storage_meta_name_query_in_t *args; storage_meta_query_one_name_args_t *query_args; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; bulk_rpc_in_t bulk_rpc_in; - void ** buf_ptrs; - hg_size_t * buf_sizes; + void **buf_ptrs; + hg_size_t *buf_sizes; uint32_t server_id; - region_info_transfer_t ** region_infos; - region_list_t * region_elt; + region_info_transfer_t **region_infos; + region_list_t *region_elt; int i, j; FUNC_ENTER(NULL); @@ -5583,9 +5583,9 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) { perr_t ret_value = SUCCEED; int i, j; - region_storage_meta_t * storage_metas = (region_storage_meta_t *)buf_cp; + region_storage_meta_t *storage_metas = (region_storage_meta_t *)buf_cp; pdc_data_server_io_list_t *io_list_elt, *io_list_target; - region_list_t * new_region; + region_list_t *new_region; FUNC_ENTER(NULL); @@ -5625,7 +5625,7 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) new_region->data_size = storage_metas[i].size; // Open shared memory and map to data buf - new_region->shm_fd = shm_open(new_region->shm_addr, O_RDONLY, 0666); + new_region->shm_fd = shm_open(new_region->shm_addr, O_RDONLY, 0644); if (new_region->shm_fd == -1) { LOG_ERROR("==PDC_SERVER[%d]: Shared memory open failed [%s]!\n", pdc_server_rank_g, new_region->shm_addr); @@ -5697,7 +5697,7 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) { perr_t ret_value = SUCCEED; uint64_t offset, read_bytes; - FILE * fp_read = NULL; + FILE *fp_read = NULL; if (region->is_data_ready == 1) return SUCCEED; @@ -5746,9 +5746,9 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) { perr_t ret_value = SUCCEED; region_list_t *region_elt; - char * prev_path = NULL; + char *prev_path = NULL; uint64_t offset, read_bytes; - FILE * fp_read = NULL; + FILE *fp_read = NULL; int read_count = 0; @@ -5887,8 +5887,8 @@ static perr_t PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_combine_op_t combine_op) { perr_t ret_value = SUCCEED; - region_list_t * req_region = NULL, *region_tmp = NULL; - region_list_t * storage_region_list_head = NULL; + region_list_t *req_region = NULL, *region_tmp = NULL; + region_list_t *storage_region_list_head = NULL; pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; uint64_t obj_id; int iter, count, is_same_region, i, can_skip; @@ -6160,7 +6160,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE * edata = (TYPE *)(_data); \ + TYPE *edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -6305,7 +6305,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE * edata = (TYPE *)(_data); \ + TYPE *edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -6466,11 +6466,11 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast char keyName[128]; char offName[128]; char out_name[256]; - double * keys = NULL; - int64_t * offsets = NULL; + double *keys = NULL; + int64_t *offsets = NULL; uint32_t *bms = NULL; uint64_t nk = 0, no = 0, nb = 0; - FILE * fp; + FILE *fp; FUNC_ENTER(NULL); @@ -6568,7 +6568,7 @@ int queryData(const char *name) { uint64_t nhits, i; - uint64_t * buf; + uint64_t *buf; double val1 = 0.0, val2 = 10.0; FastBitSelectionHandle sel1 = fastbit_selection_osr(name, FastBitCompareGreater, val1); FastBitSelectionHandle sel2 = fastbit_selection_osr(name, FastBitCompareLess, val2); @@ -6603,7 +6603,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i char offName[128]; char out_name[256]; uint64_t nk = 0, no = 0, nb = 0, size; - FILE * fp; + FILE *fp; PDC_gen_fastbit_idx_name(bmsName, "bms", obj_id, timestep, ndim, start, count); PDC_gen_fastbit_idx_name(keyName, "key", obj_id, timestep, ndim, start, count); @@ -6679,9 +6679,9 @@ PDC_query_fastbit_idx(region_list_t *region, pdc_query_constraint_t *constraint, perr_t ret_value = SUCCEED; FastBitDataType ft = 0; uint64_t type_size; - uint32_t * bms = NULL; - double * keys = NULL; - int64_t * offsets = NULL; + uint32_t *bms = NULL; + double *keys = NULL; + int64_t *offsets = NULL; int timestep; double v1, v2; size_t i; @@ -6857,7 +6857,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ pdc_query_combine_op_t combine_op) { perr_t ret_value = SUCCEED; - region_list_t * region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; + region_list_t *region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; pdc_selection_t *sel = query->sel; uint64_t nelem; size_t i, j, unit_size; @@ -6871,7 +6871,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ uint32_t ulo = 0, uhi = 0; int64_t i64lo = 0, i64hi = 0; uint64_t ui64lo = 0, ui64hi = 0; - void * value = NULL, *buf = NULL; + void *value = NULL, *buf = NULL; int n_eval_region = 0, can_skip, region_iter = 0; LOG_INFO("==PDC_SERVER[%d]: start query evaluation!\n", pdc_server_rank_g); @@ -7212,7 +7212,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ n_eval_region++; } // End DL_FOREACH - } // End not use fastbit + } // End not use fastbit if (n_eval_region == 0 && combine_op == PDC_QUERY_AND) { if (sel->nhits > 0) { @@ -7540,7 +7540,7 @@ PDC_Server_send_coords_to_client(query_task_t *task) hg_bulk_t bulk_handle; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; int client_id; FUNC_ENTER(NULL); @@ -7622,7 +7622,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; int server_id; FUNC_ENTER(NULL); @@ -7829,9 +7829,9 @@ hg_return_t PDC_Server_read_coords(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; - query_task_t * task = (query_task_t *)callback_info->arg; + query_task_t *task = (query_task_t *)callback_info->arg; pdc_query_constraint_t *constraint; - region_list_t * storage_region_head, *region_elt, *cache_region; + region_list_t *storage_region_head, *region_elt, *cache_region; size_t ndim, unit_size; uint64_t i, *coord, data_off, buf_off, my_size; @@ -7897,11 +7897,11 @@ PDC_recv_read_coords(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t * task_elt = NULL; + query_task_t *task_elt = NULL; uint64_t nhits, obj_id; uint32_t ndim; int query_id, origin; - void * buf; + void *buf; pdc_int_ret_t out; out.ret = 1; @@ -7980,7 +7980,7 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t * task_elt; + query_task_t *task_elt; uint64_t nhits = 0, total_hits; size_t ndim, unit_size; int i, query_id, origin, found_task; @@ -8394,8 +8394,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in { pdc_metadata_t *meta = NULL; int i, server_id, count, avg_count, nsent, nsent_server; - region_list_t * elt, *new_region = NULL; - void * region_bulk_buf; + region_list_t *elt, *new_region = NULL; + void *region_bulk_buf; uint64_t buf_alloc = 0, buf_off = 0; bulk_rpc_in_t header; @@ -8535,16 +8535,16 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; - void * buf; - region_list_t * regions = NULL; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; + void *buf; + region_list_t *regions = NULL; int i, nregion, *loc_len_ptr, *has_hist_ptr, found_task; uint64_t buf_off, *offset_ptr = NULL, *size_ptr = NULL; - char * loc_ptr = NULL; + char *loc_ptr = NULL; region_info_transfer_t *region_info_ptr = NULL; - pdc_histogram_t * hist_ptr = NULL; - query_task_t * task_elt = NULL; - pdc_query_t * query = NULL; + pdc_histogram_t *hist_ptr = NULL; + query_task_t *task_elt = NULL; + pdc_query_t *query = NULL; pdc_int_ret_t out; out.ret = 1; @@ -8713,10 +8713,10 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; pdc_query_xfer_t *query_xfer = (pdc_query_xfer_t *)callback_info->arg; int obj_idx = 0; - uint64_t * obj_ids; - query_task_t * new_task = NULL, *task_elt; + uint64_t *obj_ids; + query_task_t *new_task = NULL, *task_elt; int query_id_exist = 0; - pdc_query_t * query; + pdc_query_t *query; query = PDC_deserialize_query(query_xfer); if (NULL == query) { @@ -8822,7 +8822,7 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; FUNC_ENTER(NULL); @@ -8933,12 +8933,12 @@ hg_return_t PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; - get_sel_data_rpc_in_t * in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t * task_elt, *task = NULL; + get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; + query_task_t *task_elt, *task = NULL; uint64_t nhits, *coord, *coords = NULL, obj_id, buf_off, my_size, data_off, i; size_t ndim, unit_size; cache_storage_region_t *cache_region_elt; - region_list_t * storage_region_head = NULL, *cache_region, *region_elt; + region_list_t *storage_region_head = NULL, *cache_region, *region_elt; pdc_var_type_t data_type; // find task @@ -9026,8 +9026,8 @@ PDC_Server_recv_get_sel_data(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t * task_elt, *task = NULL; - pdc_metadata_t * meta; + query_task_t *task_elt, *task = NULL; + pdc_metadata_t *meta; struct hg_cb_info fake_callback_info = {0}; DL_FOREACH(query_task_list_head_g, task_elt) diff --git a/src/server/pdc_server_region/pdc_server_region_transfer.c b/src/server/pdc_server_region/pdc_server_region_transfer.c index ab9b5b1ee..ad64b0047 100644 --- a/src/server/pdc_server_region/pdc_server_region_transfer.c +++ b/src/server/pdc_server_region/pdc_server_region_transfer.c @@ -79,7 +79,7 @@ PDC_commit_request(uint64_t transfer_request_id) perr_t PDC_finish_request(uint64_t transfer_request_id) { - pdc_transfer_request_status * ptr, *tmp = NULL; + pdc_transfer_request_status *ptr, *tmp = NULL; perr_t ret_value = SUCCEED; transfer_request_wait_out_t out; transfer_request_wait_all_out_t out_all; @@ -264,8 +264,8 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob { perr_t ret_value = SUCCEED; int fd; - char * data_path = NULL; - char * user_specified_data_path = NULL; + char *data_path = NULL; + char *user_specified_data_path = NULL; char storage_location[ADDR_MAX]; ssize_t io_size; uint64_t i, j; @@ -308,7 +308,7 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob /* LOG_ERROR("Rank %d, write to offset %llu, size %llu\n", server_rank, region_info->offset[0], * region_info->size[0]); */ - fd = open(storage_location, O_RDWR | O_CREAT, 0666); + fd = open(storage_location, O_RDWR | O_CREAT, 0644); if (region_info->ndim == 1) { lseek(fd, region_info->offset[0] * unit, SEEK_SET); io_size = region_info->size[0] * unit; @@ -393,7 +393,7 @@ clean_write_bulk_data(transfer_request_all_data *request_data) int parse_bulk_data(void *buf, transfer_request_all_data *request_data, pdc_access_t access_type) { - char * ptr = (char *)buf; + char *ptr = (char *)buf; int i, j; uint64_t data_size; From 411585865dc940ed72f3afa0adbaa52b08599967 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 17 May 2025 21:23:08 +0000 Subject: [PATCH 37/43] Committing clang-format changes --- src/api/pdc_client_connect.c | 210 +++++++-------- src/server/pdc_client_server_common.c | 210 +++++++-------- .../pdc_server_region/pdc_server_data.c | 246 +++++++++--------- .../pdc_server_region_transfer.c | 8 +- 4 files changed, 337 insertions(+), 337 deletions(-) diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index 4bcbe480b..fb88915c6 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -94,7 +94,7 @@ int pdc_nclient_per_server_g = 0; char pdc_client_tmp_dir_g[ADDR_MAX]; struct _pdc_server_info *pdc_server_info_g = NULL; -static int *debug_server_id_count = NULL; +static int * debug_server_id_count = NULL; int pdc_io_request_seq_id = PDC_SEQ_ID_INIT_VALUE; struct pdc_request *pdc_io_request_list_g = NULL; @@ -110,7 +110,7 @@ int nread_bb_g = 0; double read_bb_size_g = 0.0; static int mercury_has_init_g = 0; -static hg_class_t *send_class_g = NULL; +static hg_class_t * send_class_g = NULL; static hg_context_t *send_context_g = NULL; int query_id_g = 0; @@ -125,7 +125,7 @@ static hg_atomic_int32_t response_done_g; hg_atomic_int32_t bulk_transfer_done_g; // global variables for DART -static DART *dart_g; +static DART * dart_g; static dart_hash_algo_t dart_hash_algo_g = DART_HASH; static dart_object_ref_type_t dart_obj_ref_type_g = REF_PRIMARY_ID; @@ -389,8 +389,8 @@ PDC_Client_read_server_addr_from_file() perr_t ret_value = SUCCEED; int max_tries = 9, sleeptime = 1; int i = 0, is_server_ready = 0; - char *p; - FILE *na_config = NULL; + char * p; + FILE * na_config = NULL; char config_fname[PATH_MAX]; char n_server_string[PATH_MAX]; @@ -472,7 +472,7 @@ client_send_flush_obj_all_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; flush_obj_all_out_t output; - int *rpc_return; + int * rpc_return; FUNC_ENTER(NULL); @@ -528,7 +528,7 @@ client_send_flush_obj_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; flush_obj_out_t output; - int *rpc_return; + int * rpc_return; FUNC_ENTER(NULL); @@ -556,7 +556,7 @@ client_send_close_all_server_rpc_cb(const struct hg_cb_info *callback_info) hg_return_t ret_value = HG_SUCCESS; hg_handle_t handle; close_server_out_t output; - int *rpc_return; + int * rpc_return; FUNC_ENTER(NULL); @@ -940,7 +940,7 @@ PDC_Client_lookup_server(int server_id, int is_init) hg_return_t hg_ret; struct _pdc_client_lookup_args lookup_args; char self_addr[ADDR_MAX]; - char *target_addr_string; + char * target_addr_string; FUNC_ENTER(NULL); @@ -1215,14 +1215,14 @@ hg_test_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args; hg_bulk_t local_bulk_handle; uint32_t i; - void *buf = NULL; - void **ids_buf; + void * buf = NULL; + void ** ids_buf; uint32_t n_meta; uint64_t buf_sizes[2] = {0, 0}; - uint64_t *ids_buf_sizes; + uint64_t * ids_buf_sizes; uint32_t actual_cnt; - pdc_metadata_t *meta_ptr; - uint64_t *u64_arr_ptr; + pdc_metadata_t * meta_ptr; + uint64_t * u64_arr_ptr; uint32_t bulk_sgnum; FUNC_ENTER(NULL); @@ -1325,7 +1325,7 @@ PDC_Client_check_bulk(hg_context_t *hg_context) static const char * drc_strerror(int errnum) { - char *ret_value = NULL; + char * ret_value = NULL; const char *errstring = "UNDEFINED"; FUNC_ENTER(NULL); @@ -1363,13 +1363,13 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po * "cci+tcp" */ struct hg_init_info init_info = {0}; - char *default_hg_transport = "ofi+tcp"; - char *hg_transport; + char * default_hg_transport = "ofi+tcp"; + char * hg_transport; #ifdef PDC_HAS_CRAY_DRC uint32_t credential, cookie; drc_info_handle_t credential_info; char pdc_auth_key[256] = {'\0'}; - char *auth_key; + char * auth_key; int rc; #endif @@ -1564,7 +1564,7 @@ PDC_Client_init() { perr_t ret_value = SUCCEED; pdc_server_info_g = NULL; - char *tmp_dir; + char * tmp_dir; uint32_t port; int is_mpi_init = 0; @@ -1766,16 +1766,16 @@ static hg_return_t metadata_query_bulk_cb(const struct hg_cb_info *callback_info) { hg_return_t ret_value; - struct bulk_args_t *client_lookup_args; + struct bulk_args_t * client_lookup_args; hg_handle_t handle; metadata_query_transfer_out_t output; uint32_t n_meta; hg_op_id_t hg_bulk_op_id; hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; - const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args; - void *recv_meta; + const struct hg_info * hg_info = NULL; + struct bulk_args_t * bulk_args; + void * recv_meta; FUNC_ENTER(NULL); @@ -2185,7 +2185,7 @@ PDC_Client_add_tag(pdcid_t obj_id, const char *tag) hg_handle_t metadata_add_tag_handle; uint64_t meta_id; uint32_t server_id; - struct _pdc_obj_info *obj_prop; + struct _pdc_obj_info * obj_prop; struct _pdc_client_lookup_args lookup_args; metadata_add_tag_in_t in; @@ -2406,7 +2406,7 @@ PDC_Client_delete_metadata(char *delete_name, pdcid_t obj_delete_prop) { perr_t ret_value = SUCCEED; hg_return_t hg_ret = 0; - struct _pdc_obj_prop *delete_prop; + struct _pdc_obj_prop * delete_prop; metadata_delete_in_t in; int hash_name_value; uint32_t server_id; @@ -2466,7 +2466,7 @@ PDC_Client_query_metadata_name_only(const char *obj_name, pdc_metadata_t **out) struct _pdc_metadata_query_args **lookup_args; uint32_t server_id; uint32_t i, count = 0; - hg_handle_t *metadata_query_handle; + hg_handle_t * metadata_query_handle; FUNC_ENTER(NULL); @@ -2774,7 +2774,7 @@ PDC_Client_send_name_recv_id(const char *obj_name, uint64_t cont_id, pdcid_t obj perr_t ret_value = SUCCEED; hg_return_t hg_ret; uint32_t server_id = 0; - struct _pdc_obj_prop *create_prop = NULL; + struct _pdc_obj_prop * create_prop = NULL; gen_obj_id_in_t in; uint32_t hash_name_value; struct _pdc_client_lookup_args lookup_args; @@ -2935,7 +2935,7 @@ PDC_Client_close_all_server() if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "PDC_Client_close_all_server(): Could not destroy handle"); } // End pdc_client_mpi_rank_g < pdc_server_num_g - } // End pdc_client_mpi_size_g >= pdc_server_num_g + } // End pdc_client_mpi_size_g >= pdc_server_num_g else { if (pdc_client_mpi_rank_g == 0) { for (i = 0; i < (uint32_t)pdc_server_num_g; i++) { @@ -2964,7 +2964,7 @@ PDC_Client_close_all_server() PGOTO_ERROR(FAIL, "PDC_Client_close_all_server(): Could not destroy handle"); } } // End of mpi_rank == 0 - } // End pdc_client_mpi_size_g < pdc_server_num_g + } // End pdc_client_mpi_size_g < pdc_server_num_g #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); @@ -3147,7 +3147,7 @@ PDC_Client_transfer_request_all(int n_objs, pdc_access_t access_type, uint32_t d perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_all_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; int i; hg_handle_t client_send_transfer_request_all_handle; struct _pdc_transfer_request_all_args transfer_args; @@ -3273,7 +3273,7 @@ PDC_Client_transfer_request_metadata_query2(char *buf, uint64_t total_buf_size, perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_metadata_query2_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; hg_handle_t client_send_transfer_request_metadata_query2_handle; struct _pdc_transfer_request_metadata_query2_args transfer_args; @@ -3337,7 +3337,7 @@ PDC_Client_transfer_request_metadata_query(char *buf, uint64_t total_buf_size, i perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_metadata_query_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; hg_handle_t client_send_transfer_request_metadata_query_handle; struct _pdc_transfer_request_metadata_query_args transfer_args; @@ -3402,7 +3402,7 @@ PDC_Client_transfer_request_wait_all(int n_objs, pdcid_t *transfer_request_id, u perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_wait_all_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; hg_handle_t client_send_transfer_request_wait_all_handle; struct _pdc_transfer_request_wait_all_args transfer_args; char cur_time[64]; @@ -3478,7 +3478,7 @@ PDC_Client_transfer_request(void *buf, pdcid_t obj_id, uint32_t data_server_id, perr_t ret_value = SUCCEED; hg_return_t hg_ret = HG_SUCCESS; transfer_request_in_t in; - hg_class_t *hg_class; + hg_class_t * hg_class; uint32_t meta_server_id; hg_size_t total_data_size; int i; @@ -3714,12 +3714,12 @@ PDC_Client_buf_map(pdcid_t local_region_id, pdcid_t remote_obj_id, size_t ndim, hg_return_t hg_ret = HG_SUCCESS; buf_map_in_t in; uint32_t data_server_id, meta_server_id; - hg_class_t *hg_class; + hg_class_t * hg_class; hg_uint32_t i, j; hg_uint32_t local_count; - void **data_ptrs = NULL; - size_t *data_size = NULL; + void ** data_ptrs = NULL; + size_t * data_size = NULL; size_t unit, unit_to; struct _pdc_buf_map_args map_args; hg_handle_t client_send_buf_map_handle; @@ -4662,11 +4662,11 @@ PDC_Client_get_data_from_server_shm_cb(const struct hg_cb_info *callback_info) int shm_fd = -1; // file descriptor, from shm_open() uint32_t i = 0; - char *shm_base = NULL; // base address, from mmap() - char *shm_addr = NULL; + char * shm_base = NULL; // base address, from mmap() + char * shm_addr = NULL; uint64_t data_size = 1; - client_read_info_t *read_info = NULL; - struct pdc_request *elt = NULL; + client_read_info_t * read_info = NULL; + struct pdc_request * elt = NULL; struct pdc_region_info *target_region = NULL; #ifdef ENABLE_TIMING struct timeval pdc_timer_start; @@ -4757,8 +4757,8 @@ PDC_Client_data_server_read_check(int server_id, uint32_t client_id, pdc_metadat uint64_t read_size = 1; hg_handle_t data_server_read_check_handle; int shm_fd; // file descriptor, from shm_open() - char *shm_base; // base address, from mmap() - char *shm_addr; + char * shm_base; // base address, from mmap() + char * shm_addr; #ifdef ENABLE_TIMING struct timeval pdc_timer_start; struct timeval pdc_timer_end; @@ -4893,8 +4893,8 @@ PDC_Client_data_server_read(struct pdc_request *request) data_server_read_in_t in; hg_handle_t data_server_read_handle; int server_id, n_client, n_update; - pdc_metadata_t *meta; - struct pdc_region_info *region; + pdc_metadata_t * meta; + struct pdc_region_info * region; FUNC_ENTER(NULL); @@ -5026,8 +5026,8 @@ PDC_Client_data_server_write_check(struct pdc_request *request, int *status) data_server_write_check_in_t in; hg_handle_t data_server_write_check_handle; int server_id; - pdc_metadata_t *meta; - struct pdc_region_info *region; + pdc_metadata_t * meta; + struct pdc_region_info * region; uint64_t write_size = 1; uint32_t i; @@ -5128,9 +5128,9 @@ PDC_Client_data_server_write(struct pdc_request *request) int server_ret; hg_handle_t data_server_write_handle; int server_id, n_client, n_update; - pdc_metadata_t *meta; - struct pdc_region_info *region; - void *buf; + pdc_metadata_t * meta; + struct pdc_region_info * region; + void * buf; int rnd; #ifdef ENABLE_TIMING @@ -5186,7 +5186,7 @@ PDC_Client_data_server_write(struct pdc_request *request) request->shm_base = mmap(0, region_size, PROT_READ | PROT_WRITE, MAP_SHARED, request->shm_fd, 0); if (request->shm_base == MAP_FAILED) PGOTO_ERROR(FAIL, "==PDC_CLIENT: Shared memory mmap failed, region size = %" PRIu64 "", region_size); - // close and shm_unlink? + // close and shm_unlink? #ifdef ENABLE_TIMING gettimeofday(&pdc_timer_start, 0); @@ -5398,7 +5398,7 @@ PDC_Client_write_id(pdcid_t local_obj_id, struct pdc_region_info *region, void * struct _pdc_id_info *info; struct _pdc_obj_info *object; - pdc_metadata_t *meta; + pdc_metadata_t * meta; perr_t ret_value = SUCCEED; FUNC_ENTER(NULL); @@ -5629,7 +5629,7 @@ PDC_Client_add_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdcid_t lo { perr_t ret_value = SUCCEED; int i; - uint64_t *obj_ids; + uint64_t * obj_ids; uint64_t cont_meta_id; struct _pdc_id_info *id_info = NULL; @@ -5655,7 +5655,7 @@ PDC_Client_del_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdcid_t lo { perr_t ret_value = SUCCEED; int i; - uint64_t *obj_ids; + uint64_t * obj_ids; uint64_t cont_meta_id; struct _pdc_id_info *id_info = NULL; @@ -5683,7 +5683,7 @@ PDC_Client_add_tags_to_container(pdcid_t cont_id, char *tags) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; uint32_t server_id; - struct _pdc_id_info *info; + struct _pdc_id_info * info; struct _pdc_cont_info *object; uint64_t cont_meta_id; cont_add_tags_rpc_in_t add_tag_rpc_in; @@ -5938,12 +5938,12 @@ PDC_Client_query_name_read_entire_obj(int nobj, char **obj_names, void ***out_bu hg_handle_t rpc_handle; hg_bulk_t bulk_handle; uint32_t server_id; - uint64_t *buf_sizes, total_size; + uint64_t * buf_sizes, total_size; int i; query_read_obj_name_in_t bulk_rpc_in; // Reuse the existing args structure update_region_storage_meta_bulk_args_t cb_args; - struct pdc_request *request; + struct pdc_request * request; FUNC_ENTER(NULL); @@ -6230,7 +6230,7 @@ static region_list_t * PDC_get_storage_meta_from_io_list(pdc_data_server_io_list_t **list, region_storage_meta_t *storage_meta) { pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; - region_list_t *ret_value = NULL; + region_list_t * ret_value = NULL; FUNC_ENTER(NULL); @@ -6256,7 +6256,7 @@ PDC_add_storage_meta_to_io_list(pdc_data_server_io_list_t **list, region_storage { pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; - region_list_t *new_region; + region_list_t * new_region; int j; perr_t ret_value = SUCCEED; @@ -6323,7 +6323,7 @@ PDC_send_region_storage_meta_shm(uint32_t server_id, int n, region_storage_meta_ buf_sizes = n * sizeof(region_storage_meta_t); hg_ret = HG_Bulk_create(send_class_g, 1, (void **)&storage_meta, (const hg_size_t *)&buf_sizes, - HG_BULK_READ_ONLY, &bulk_handle); + HG_BULK_READ_ONLY, &bulk_handle); if (hg_ret != HG_SUCCESS) PGOTO_ERROR(FAIL, "Could not create bulk data handle"); @@ -6356,7 +6356,7 @@ PDC_Client_cp_data_to_local_server(int nobj, region_storage_meta_t **all_storage perr_t ret_value = SUCCEED; uint32_t ndim, server_id; uint64_t total_size = 0, cp_loc = 0; - void *buf = NULL; + void * buf = NULL; char shm_addr[ADDR_MAX]; int i, *total_obj = NULL, ntotal_obj = nobj, *recvcounts = NULL, *displs = NULL; region_storage_meta_t *all_region_storage_meta_1d = NULL, *my_region_storage_meta_1d = NULL; @@ -6468,8 +6468,8 @@ PDC_Client_read_with_storage_meta(int nobj, region_storage_meta_t **all_storage_ { perr_t ret_value = SUCCEED; int i; - char *fname, *prev_fname; - FILE *fp_read = NULL; + char * fname, *prev_fname; + FILE * fp_read = NULL; uint32_t ndim; uint64_t req_start, req_count, storage_start, storage_count, file_offset, buf_size; size_t read_bytes; @@ -6570,15 +6570,15 @@ PDC_Client_query_multi_storage_info(int nobj, char **obj_names, region_storage_m hg_bulk_t bulk_handle; uint32_t server_id; - uint64_t *buf_sizes = NULL, total_size; + uint64_t * buf_sizes = NULL, total_size; int i, j, loc, iter, *n_obj_name_by_server = NULL; - int **obj_names_server_seq_mapping = NULL, *obj_names_server_seq_mapping_1d; + int ** obj_names_server_seq_mapping = NULL, *obj_names_server_seq_mapping_1d; int send_n_request = 0; - char ***obj_names_by_server = NULL; - char **obj_names_by_server_2d = NULL; + char *** obj_names_by_server = NULL; + char ** obj_names_by_server_2d = NULL; query_read_obj_name_in_t bulk_rpc_in; update_region_storage_meta_bulk_args_t cb_args; - struct pdc_request **requests, *request; + struct pdc_request ** requests, *request; FUNC_ENTER(NULL); @@ -6801,12 +6801,12 @@ PDC_Client_query_name_read_entire_obj_client_agg(int my_nobj, char **my_obj_name size_t *out_buf_sizes) { perr_t ret_value = SUCCEED; - char **all_names = my_obj_names; - char *local_names_1d, *all_names_1d = NULL; - int *total_obj = NULL, i, ntotal_obj = my_nobj, *recvcounts = NULL, *displs = NULL; + char ** all_names = my_obj_names; + char * local_names_1d, *all_names_1d = NULL; + int * total_obj = NULL, i, ntotal_obj = my_nobj, *recvcounts = NULL, *displs = NULL; size_t max_name_len = 64; region_storage_meta_t **all_storage_meta = NULL, **my_storage_meta = NULL; - region_storage_meta_t *my_storage_meta_1d = NULL, *res_storage_meta_1d = NULL; + region_storage_meta_t * my_storage_meta_1d = NULL, *res_storage_meta_1d = NULL; #ifdef ENABLE_TIMING struct timeval pdc_timer1; @@ -7096,7 +7096,7 @@ PDC_Client_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { if (is_client_debug_g == 1) { @@ -7167,8 +7167,8 @@ PDC_add_kvtag(pdcid_t obj_id, pdc_kvtag_t *kvtag, int is_cont) uint32_t server_id; hg_handle_t metadata_add_kvtag_handle; metadata_add_kvtag_in_t in; - struct _pdc_obj_info *obj_prop; - struct _pdc_cont_info *cont_prop; + struct _pdc_obj_info * obj_prop; + struct _pdc_cont_info * cont_prop; struct _pdc_client_lookup_args lookup_args; FUNC_ENTER(NULL); @@ -7275,8 +7275,8 @@ PDC_get_kvtag(pdcid_t obj_id, char *tag_name, pdc_kvtag_t **kvtag, int is_cont) hg_handle_t metadata_get_kvtag_handle; metadata_get_kvtag_in_t in; struct _pdc_get_kvtag_args lookup_args; - struct _pdc_obj_info *obj_prop; - struct _pdc_cont_info *cont_prop; + struct _pdc_obj_info * obj_prop; + struct _pdc_cont_info * cont_prop; FUNC_ENTER(NULL); @@ -7336,12 +7336,12 @@ kvtag_query_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_bulk_t origin_bulk_handle = hg_cb_info->info.bulk.origin_handle; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; uint32_t n_meta, actual_cnt; - void *buf = NULL; + void * buf = NULL; uint64_t buf_sizes[1]; uint32_t bulk_sgnum; - uint64_t *ids_buf_sizes; - void **ids_buf; - uint64_t *u64_arr_ptr; + uint64_t * ids_buf_sizes; + void ** ids_buf; + uint64_t * u64_arr_ptr; FUNC_ENTER(NULL); @@ -7394,14 +7394,14 @@ static hg_return_t kvtag_query_forward_cb(const struct hg_cb_info *callback_info) { hg_return_t ret_value; - struct bulk_args_t *bulk_arg; + struct bulk_args_t * bulk_arg; hg_handle_t handle; metadata_query_transfer_out_t output; uint32_t n_meta; hg_op_id_t hg_bulk_op_id; hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; - const struct hg_info *hg_info = NULL; + const struct hg_info * hg_info = NULL; FUNC_ENTER(NULL); @@ -7579,8 +7579,8 @@ PDCtag_delete(pdcid_t obj_id, char *tag_name, int is_cont) uint32_t server_id; hg_handle_t metadata_del_kvtag_handle; metadata_get_kvtag_in_t in; - struct _pdc_obj_info *obj_prop; - struct _pdc_cont_info *cont_prop; + struct _pdc_obj_info * obj_prop; + struct _pdc_cont_info * cont_prop; struct _pdc_client_lookup_args lookup_args; FUNC_ENTER(NULL); @@ -7822,7 +7822,7 @@ PDCobj_put_data(const char *obj_name, void *data, uint64_t size, pdcid_t cont_id perr_t ret; // pdc_metadata_t *meta; struct _pdc_cont_info *info = NULL; - struct _pdc_id_info *id_info = NULL; + struct _pdc_id_info * id_info = NULL; pdcid_t transfer_request; FUNC_ENTER(NULL); @@ -7928,7 +7928,7 @@ PDC_Client_del_metadata(pdcid_t obj_id, int is_cont) { perr_t ret_value = SUCCEED; uint64_t meta_id; - struct _pdc_obj_info *obj_prop; + struct _pdc_obj_info * obj_prop; struct _pdc_cont_info *cont_prop; FUNC_ENTER(NULL); @@ -8061,7 +8061,7 @@ hg_return_t PDC_recv_nhits(const struct hg_cb_info *callback_info) { hg_return_t ret_value = HG_SUCCESS; - send_nhits_t *in = (send_nhits_t *)callback_info->arg; + send_nhits_t * in = (send_nhits_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; FUNC_ENTER(NULL); @@ -8089,10 +8089,10 @@ PDC_send_data_query(pdc_query_t *query, pdc_query_get_op_t get_op, uint64_t *nhi { perr_t ret_value = SUCCEED; hg_return_t hg_ret = 0; - uint32_t *target_servers = NULL; + uint32_t * target_servers = NULL; int i, server_id, next_server = 0, prev_server = 0, ntarget = 0; hg_handle_t handle; - pdc_query_xfer_t *query_xfer; + pdc_query_xfer_t * query_xfer; struct _pdc_client_lookup_args lookup_args; struct _pdc_query_result_list *result; @@ -8180,12 +8180,12 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) { hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; uint64_t nhits = 0; uint32_t ndim; int query_id, origin; - void *buf; + void * buf; pdc_int_ret_t out; FUNC_ENTER(NULL); @@ -8266,7 +8266,7 @@ PDC_Client_get_sel_data(pdcid_t obj_id, pdc_selection_t *sel, void *data) uint64_t meta_id, off; get_sel_data_rpc_in_t in; struct _pdc_client_lookup_args lookup_args; - struct _pdc_obj_info *obj_prop; + struct _pdc_obj_info * obj_prop; struct _pdc_query_result_list *result_elt; FUNC_ENTER(NULL); @@ -8339,11 +8339,11 @@ PDC_recv_read_coords_data(const struct hg_cb_info *callback_info) { hg_return_t ret_value = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; struct _pdc_query_result_list *result_elt; uint64_t nhits = 0; int query_id, seq_id; - void *buf; + void * buf; pdc_int_ret_t out; FUNC_ENTER(NULL); @@ -8415,9 +8415,9 @@ report_avg_server_profiling_rst() { for (int i = 0; i < pdc_server_num_g; i++) { - double avg_srv_time = server_call_count_g[i] > 0 - ? (double)(server_time_total_g[i]) / (double)(server_call_count_g[i]) - : 0.0; + double avg_srv_time = server_call_count_g[i] > 0 + ? (double)(server_time_total_g[i]) / (double)(server_call_count_g[i]) + : 0.0; double srv_mem_usage = server_mem_usage_g[i] / 1024.0 / 1024.0; LOG_INFO("==PDC_CLIENT[%d]: server %d, avg profiling time: %.4f ms, memory usage: %.4f MB\n", pdc_client_mpi_rank_g, i, avg_srv_time / 1000.0, srv_mem_usage); @@ -8557,7 +8557,7 @@ static hg_return_t dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) { hg_return_t ret_value; - struct bulk_args_t *client_lookup_args; + struct bulk_args_t * client_lookup_args; hg_handle_t handle; dart_perform_one_server_out_t output; uint32_t n_meta; @@ -8566,8 +8566,8 @@ dart_perform_one_server_on_receive_cb(const struct hg_cb_info *callback_info) hg_bulk_t local_bulk_handle = HG_BULK_NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args; - void *recv_meta; + struct bulk_args_t * bulk_args; + void * recv_meta; FUNC_ENTER(NULL); @@ -8739,7 +8739,7 @@ dart_perform_on_servers(index_hash_result_t **hash_result, int num_servers, { struct bulk_args_t *lookup_args = (struct bulk_args_t *)calloc(num_servers, sizeof(struct bulk_args_t)); uint64_t ret_value = 0; - hg_handle_t *dart_request_handles = (hg_handle_t *)calloc(num_servers, sizeof(hg_handle_t)); + hg_handle_t * dart_request_handles = (hg_handle_t *)calloc(num_servers, sizeof(hg_handle_t)); int num_requests = 0; uint32_t total_n_meta = 0; dart_op_type_t op_type = dart_in->op_type; @@ -8819,9 +8819,9 @@ PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char *query_s stopwatch_t timer; timer_start(&timer); - char *k_query = get_key(query_string, '='); - char *v_query = get_value(query_string, '='); - char *tok = NULL; + char * k_query = get_key(query_string, '='); + char * v_query = get_value(query_string, '='); + char * tok = NULL; dart_op_type_t dart_op; dart_determine_query_token_by_key_query(k_query, &tok, &dart_op); diff --git a/src/server/pdc_client_server_common.c b/src/server/pdc_client_server_common.c index ae5676c3e..31aca0dbf 100644 --- a/src/server/pdc_client_server_common.c +++ b/src/server/pdc_client_server_common.c @@ -1571,7 +1571,7 @@ HG_TEST_RPC_CB(metadata_query, handle) hg_return_t ret_value = HG_SUCCESS; metadata_query_in_t in; metadata_query_out_t out; - pdc_metadata_t *query_result = NULL; + pdc_metadata_t * query_result = NULL; FUNC_ENTER(NULL); @@ -1612,7 +1612,7 @@ HG_TEST_RPC_CB(obj_reset_dims, handle) hg_return_t ret_value = HG_SUCCESS; obj_reset_dims_in_t in; obj_reset_dims_out_t out; - pdc_metadata_t *query_result = NULL; + pdc_metadata_t * query_result = NULL; FUNC_ENTER(NULL); @@ -2000,7 +2000,7 @@ pdc_region_write_out_progress(void *arg) { HG_THREAD_RETURN_TYPE ret_value = (HG_THREAD_RETURN_TYPE)0; struct buf_map_release_bulk_args *bulk_args = (struct buf_map_release_bulk_args *)arg; - struct pdc_region_info *remote_reg_info = NULL; + struct pdc_region_info * remote_reg_info = NULL; region_lock_out_t out; FUNC_ENTER(NULL); @@ -2100,7 +2100,7 @@ pdc_region_read_from_progress(void *arg) { HG_THREAD_RETURN_TYPE ret_value = (HG_THREAD_RETURN_TYPE)0; struct buf_map_release_bulk_args *bulk_args = (struct buf_map_release_bulk_args *)arg; - const struct hg_info *hg_info = NULL; + const struct hg_info * hg_info = NULL; hg_return_t hg_ret; size_t size; int error = 0; @@ -2153,21 +2153,21 @@ transform_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_inf hg_return_t ret_value = HG_SUCCESS; region_lock_out_t out; struct buf_map_transform_and_release_bulk_args *bulk_args = NULL; - void *data_buf; - char *buf; + void * data_buf; + char * buf; int ndim; int transform_id; int type_extent = 0; int use_transform_size = 0; size_t unit = 1; int64_t transform_size, expected_size; - uint64_t *dims = NULL; + uint64_t * dims = NULL; pdc_var_type_t destType; - struct _pdc_region_transform_ftn_info **registry = NULL; + struct _pdc_region_transform_ftn_info ** registry = NULL; int registered_count; #ifdef ENABLE_MULTITHREAD data_server_region_t *target_reg = NULL; - region_buf_map_t *elt; + region_buf_map_t * elt; #else struct pdc_region_info *remote_reg_info = NULL; #endif @@ -2338,12 +2338,12 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info hg_return_t ret_value = HG_SUCCESS; region_lock_out_t out; struct buf_map_analysis_and_release_bulk_args *bulk_args = NULL; - void *data_buf; + void * data_buf; int ndim; uint64_t type_extent; - uint64_t *dims = NULL; - struct pdc_region_info *remote_reg_info = NULL; - struct pdc_region_info *local_reg_info = NULL; + uint64_t * dims = NULL; + struct pdc_region_info * remote_reg_info = NULL; + struct pdc_region_info * local_reg_info = NULL; double start_t, end_t, analysis_t, io_t; double averages[4]; @@ -2396,7 +2396,7 @@ analysis_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info int registered_count = PDC_get_analysis_registry(®istry); if ((registered_count >= analysis_meta_index) && (registry != NULL)) { - int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t *_cbs) = + int (*analysis_ftn)(pdcid_t iterIn, pdcid_t iterOut, struct _pdc_iterator_cbs_t * _cbs) = registry[analysis_meta_index]->ftnPtr; int result = analysis_ftn(bulk_args->in.input_iter, bulk_args->in.output_iter, &iter_cbs); LOG_INFO("==PDC_SERVER: Analysis returned %d\n", result); @@ -2495,7 +2495,7 @@ buf_map_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info) struct buf_map_release_bulk_args *bulk_args = NULL; #ifdef ENABLE_MULTITHREAD data_server_region_t *target_reg = NULL; - region_buf_map_t *elt; + region_buf_map_t * elt; #else struct pdc_region_info *remote_reg_info = NULL; #endif @@ -2680,23 +2680,23 @@ HG_TEST_RPC_CB(region_release, handle) hg_return_t hg_ret; region_lock_in_t in; region_lock_out_t out; - const struct hg_info *hg_info = NULL; - data_server_region_t *target_obj = NULL; + const struct hg_info * hg_info = NULL; + data_server_region_t * target_obj = NULL; int error = 0; int dirty_reg = 0; hg_size_t size, size2; - void *data_buf; - struct pdc_region_info *server_region; - region_list_t *elt = NULL, *request_region = NULL, *tmp = NULL, *elt_tmp = NULL; + void * data_buf; + struct pdc_region_info * server_region; + region_list_t * elt = NULL, *request_region = NULL, *tmp = NULL, *elt_tmp = NULL; struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; - struct buf_map_release_bulk_args *buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; + struct buf_map_release_bulk_args * buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info *remote_reg_info = NULL; - region_buf_map_t *eltt = NULL, *eltt2 = NULL, *eltt_tmp = NULL; + struct pdc_region_info * remote_reg_info = NULL; + region_buf_map_t * eltt = NULL, *eltt2 = NULL, *eltt_tmp = NULL; hg_uint32_t remote_count; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; #ifdef PDC_TIMING double start, end; #endif @@ -3034,10 +3034,10 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha const struct hg_info *hg_info = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; hg_uint32_t remote_count; - void *data_buf = NULL; + void * data_buf = NULL; ; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; region_buf_map_t *eltt2; region_lock_out_t out; @@ -3046,8 +3046,8 @@ region_read_transform_release(region_transform_and_lock_in_t *in, hg_handle_t ha int dirty_reg = 0; struct buf_map_transform_and_release_bulk_args *transform_release_bulk_args = NULL; - struct pdc_region_info *remote_reg_info = NULL; - data_server_region_t *target_obj = NULL; + struct pdc_region_info * remote_reg_info = NULL; + data_server_region_t * target_obj = NULL; region_list_t *tmp, *elt, *request_region = (region_list_t *)malloc(sizeof(region_list_t)); FUNC_ENTER(NULL); @@ -3199,19 +3199,19 @@ HG_TEST_RPC_CB(transform_region_release, handle) region_transform_and_lock_in_t in; region_lock_in_t reg_lock_in; region_lock_out_t out; - const struct hg_info *hg_info = NULL; - data_server_region_t *target_obj; + const struct hg_info * hg_info = NULL; + data_server_region_t * target_obj; int error = 0; int dirty_reg = 0; hg_size_t size; - void *data_buf; - region_list_t *elt, *request_region, *tmp; + void * data_buf; + region_list_t * elt, *request_region, *tmp; struct buf_map_transform_and_release_bulk_args *buf_map_bulk_args = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - region_buf_map_t *eltt; + region_buf_map_t * eltt; hg_uint32_t remote_count; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; FUNC_ENTER(NULL); @@ -3347,14 +3347,14 @@ HG_TEST_RPC_CB(region_transform_release, handle) int dirty_reg = 0; hg_size_t size, remote_size; ; - void *data_buf; - region_list_t *elt, *request_region, *tmp; + void * data_buf; + region_list_t * elt, *request_region, *tmp; struct buf_map_release_bulk_args *buf_map_bulk_args = NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - region_buf_map_t *eltt; + region_buf_map_t * eltt; hg_uint32_t k, remote_count = 0; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; size_t type_size = 0; ; size_t dims[4] = {0, 0, 0, 0}; @@ -3506,26 +3506,26 @@ HG_TEST_RPC_CB(region_analysis_release, handle) } in; region_lock_out_t out; - const struct hg_info *hg_info = NULL; - data_server_region_t *target_obj; - data_server_region_t *lock_obj; + const struct hg_info * hg_info = NULL; + data_server_region_t * target_obj; + data_server_region_t * lock_obj; int error = 0; int dirty_reg = 0; hg_size_t size; hg_return_t hg_ret; - void *data_buf; - struct pdc_region_info *server_region; - region_list_t *elt, *request_region, *tmp; - struct region_lock_update_bulk_args *lock_update_bulk_args = NULL; + void * data_buf; + struct pdc_region_info * server_region; + region_list_t * elt, *request_region, *tmp; + struct region_lock_update_bulk_args * lock_update_bulk_args = NULL; struct buf_map_analysis_and_release_bulk_args *buf_map_bulk_args = NULL, *obj_map_bulk_args = NULL; hg_bulk_t lock_local_bulk_handle = HG_BULK_NULL; hg_bulk_t remote_bulk_handle = HG_BULK_NULL; - struct pdc_region_info *remote_reg_info; - region_buf_map_t *eltt, *eltt2; + struct pdc_region_info * remote_reg_info; + region_buf_map_t * eltt, *eltt2; hg_uint32_t k, remote_count = 0; - void **data_ptrs_to = NULL; - size_t *data_size_to = NULL; + void ** data_ptrs_to = NULL; + size_t * data_size_to = NULL; size_t type_size = 0; size_t dims[4] = {0, 0, 0, 0}; @@ -3959,7 +3959,7 @@ HG_TEST_RPC_CB(get_remote_metadata, handle) hg_return_t ret_value = HG_SUCCESS; get_remote_metadata_in_t in; get_remote_metadata_out_t out; - pdc_metadata_t *meta; + pdc_metadata_t * meta; FUNC_ENTER(NULL); @@ -3994,7 +3994,7 @@ HG_TEST_RPC_CB(buf_unmap_server, handle) hg_return_t ret_value = HG_SUCCESS; buf_unmap_in_t in; buf_unmap_out_t out; - pdc_metadata_t *target_obj; + pdc_metadata_t * target_obj; region_buf_map_t *tmp, *elt; FUNC_ENTER(NULL); @@ -4043,8 +4043,8 @@ HG_TEST_RPC_CB(buf_map_server, handle) hg_return_t ret_value = HG_SUCCESS; buf_map_in_t in; buf_map_out_t out; - pdc_metadata_t *target_obj; - region_list_t *elt, *request_region; + pdc_metadata_t * target_obj; + region_list_t * elt, *request_region; region_buf_map_t *buf_map_ptr; FUNC_ENTER(NULL); @@ -4108,9 +4108,9 @@ HG_TEST_RPC_CB(buf_map, handle) buf_map_in_t in; buf_map_out_t out; const struct hg_info *info; - region_list_t *request_region; - region_buf_map_t *new_buf_map_ptr = NULL; - void *data_ptr; + region_list_t * request_region; + region_buf_map_t * new_buf_map_ptr = NULL; + void * data_ptr; size_t ndim; #ifdef PDC_TIMING double start, end; @@ -4175,9 +4175,9 @@ HG_TEST_RPC_CB(query_partial, handle) hg_return_t hg_ret; hg_bulk_t bulk_handle = HG_BULK_NULL; uint32_t i; - void **buf_ptrs; - size_t *buf_sizes; - uint32_t *n_meta_ptr, n_buf; + void ** buf_ptrs; + size_t * buf_sizes; + uint32_t * n_meta_ptr, n_buf; metadata_query_transfer_in_t in; metadata_query_transfer_out_t out; @@ -4270,7 +4270,7 @@ HG_TEST_RPC_CB(query_kvtag, handle) hg_return_t ret_value; hg_return_t hg_ret; hg_bulk_t bulk_handle = HG_BULK_NULL; - uint64_t *buf_ptr; + uint64_t * buf_ptr; size_t buf_size[1]; uint32_t nmeta; pdc_kvtag_t in; @@ -4331,10 +4331,10 @@ update_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int cnt, i; - uint64_t *obj_id_ptr; + uint64_t * obj_id_ptr; pdc_int_ret_t out_struct; - void **buf; - void *buf_1d; + void ** buf; + void * buf_1d; FUNC_ENTER(NULL); @@ -4390,7 +4390,7 @@ HG_TEST_RPC_CB(bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; bulk_rpc_in_t in_struct; int cnt; @@ -4538,7 +4538,7 @@ HG_TEST_RPC_CB(data_server_read_check, handle) // Decode input data_server_read_check_in_t in; data_server_read_check_out_t out; - server_read_check_out_t *read_out = calloc(1, sizeof(server_read_check_out_t)); + server_read_check_out_t * read_out = calloc(1, sizeof(server_read_check_out_t)); FUNC_ENTER(NULL); @@ -4640,7 +4640,7 @@ HG_TEST_RPC_CB(get_metadata_by_id, handle) hg_return_t ret_value = HG_SUCCESS; get_metadata_by_id_in_t in; get_metadata_by_id_out_t out; - pdc_metadata_t *target = NULL; + pdc_metadata_t * target = NULL; FUNC_ENTER(NULL); @@ -4746,8 +4746,8 @@ char * PDC_find_in_path(char *workingDir, char *application) { struct stat fileStat; - char *ret_value = NULL; - char *pathVar = getenv("PATH"); + char * ret_value = NULL; + char * pathVar = getenv("PATH"); char colon = ':'; char checkPath[PATH_MAX]; @@ -4802,11 +4802,11 @@ cont_add_del_objs_bulk_cb(const struct hg_cb_info *hg_cb_info) { hg_return_t ret_value = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int cnt, op; cont_add_del_objs_rpc_out_t out_struct; - uint64_t *obj_ids, cont_id; + uint64_t * obj_ids, cont_id; FUNC_ENTER(NULL); @@ -4857,8 +4857,8 @@ cont_add_del_objs_bulk_cb(const struct hg_cb_info *hg_cb_info) HG_TEST_RPC_CB(cont_add_del_objs_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; - const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + const struct hg_info * hg_info = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; cont_add_del_objs_rpc_in_t in_struct; @@ -4938,13 +4938,13 @@ query_read_obj_name_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; hg_return_t ret = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int iter; size_t i; - char *tmp_buf; + char * tmp_buf; query_read_obj_name_out_t out_struct; - query_read_names_args_t *query_read_names_args; + query_read_names_args_t * query_read_names_args; FUNC_ENTER(NULL); @@ -5000,8 +5000,8 @@ HG_TEST_RPC_CB(query_read_obj_name_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; hg_return_t ret = HG_SUCCESS; - const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + const struct hg_info * hg_info = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; query_read_obj_name_in_t in_struct; @@ -5109,13 +5109,13 @@ get_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int i, task_id, n_regions; - int *int_ptr; - char *char_ptr, *file_path; - uint64_t *uint64_ptr, offset; + int * int_ptr; + char * char_ptr, *file_path; + uint64_t * uint64_ptr, offset; - void *buf; + void * buf; region_info_transfer_t *region_info_ptr; - region_list_t *region_list, *region_list_head = NULL; + region_list_t * region_list, *region_list_head = NULL; pdc_int_ret_t out_struct; FUNC_ENTER(NULL); @@ -5185,7 +5185,7 @@ HG_TEST_RPC_CB(get_storage_meta_name_query_bulk_result_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; bulk_rpc_in_t in_struct; @@ -5238,8 +5238,8 @@ notify_client_multi_io_complete_bulk_cb(const struct hg_cb_info *hg_cb_info) struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int n_shm; - void *buf; - char *buf_cp; + void * buf; + char * buf_cp; pdc_int_ret_t out_struct; FUNC_ENTER(NULL); @@ -5282,7 +5282,7 @@ HG_TEST_RPC_CB(notify_client_multi_io_complete_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; bulk_rpc_in_t in_struct; @@ -5325,7 +5325,7 @@ PDC_add_task_to_list(pdc_task_list_t **target_list, perr_t (*cb)(), void *cb_arg #ifdef ENABLE_MULTITHREAD void *_mutex) #else - void *_mutex ATTRIBUTE(unused)) + void *_mutex ATTRIBUTE(unused)) #endif { int ret_value = 0; @@ -5369,7 +5369,7 @@ PDC_del_task_from_list(pdc_task_list_t **target_list, pdc_task_list_t *del, #ifdef ENABLE_MULTITHREAD void *_mutex) #else - void *_mutex ATTRIBUTE(unused)) + void *_mutex ATTRIBUTE(unused)) #endif { perr_t ret_value = SUCCEED; @@ -5553,13 +5553,13 @@ query_read_obj_name_client_bulk_cb(const struct hg_cb_info *hg_cb_info) { hg_return_t ret_value = HG_SUCCESS; // Server executes after received request from client - struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; int iter; size_t i; - char *tmp_buf; + char * tmp_buf; query_read_obj_name_out_t out_struct; - query_read_names_args_t *query_read_names_args; + query_read_names_args_t * query_read_names_args; FUNC_ENTER(NULL); @@ -5615,8 +5615,8 @@ query_read_obj_name_client_bulk_cb(const struct hg_cb_info *hg_cb_info) HG_TEST_RPC_CB(query_read_obj_name_client_rpc, handle) { hg_return_t ret_value = HG_SUCCESS; - const struct hg_info *hg_info = NULL; - struct bulk_args_t *bulk_args = NULL; + const struct hg_info * hg_info = NULL; + struct bulk_args_t * bulk_args = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; query_read_obj_name_in_t in_struct; @@ -5666,9 +5666,9 @@ static hg_return_t send_client_storage_meta_bulk_cb(const struct hg_cb_info *hg_cb_info) { hg_return_t ret_value = HG_SUCCESS; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; - void *buf = NULL, *buf_cp = NULL; + void * buf = NULL, *buf_cp = NULL; process_bulk_storage_meta_args_t *process_args = NULL; FUNC_ENTER(NULL); @@ -5713,7 +5713,7 @@ HG_TEST_RPC_CB(send_client_storage_meta_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; bulk_rpc_in_t in_struct; pdc_int_ret_t out_struct; int cnt; @@ -5773,7 +5773,7 @@ server_recv_shm_bulk_cb(const struct hg_cb_info *hg_cb_info) hg_return_t ret_value = HG_SUCCESS; struct bulk_args_t *bulk_args = (struct bulk_args_t *)hg_cb_info->arg; hg_bulk_t local_bulk_handle = hg_cb_info->info.bulk.local_handle; - void *buf = NULL, *buf_cp = NULL; + void * buf = NULL, *buf_cp = NULL; FUNC_ENTER(NULL); @@ -5810,7 +5810,7 @@ HG_TEST_RPC_CB(send_shm_bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t *bulk_args = NULL; + struct bulk_args_t * bulk_args = NULL; bulk_rpc_in_t in_struct; pdc_int_ret_t out_struct; int cnt; @@ -5978,7 +5978,7 @@ HG_TEST_RPC_CB(send_bulk_rpc, handle) const struct hg_info *hg_info = NULL; hg_bulk_t origin_bulk_handle = HG_BULK_NULL; hg_bulk_t local_bulk_handle = HG_BULK_NULL; - struct bulk_args_t *bulk_arg = NULL; + struct bulk_args_t * bulk_arg = NULL; bulk_rpc_in_t in_struct; hg_return_t (*func_ptr)(const struct hg_cb_info *hg_cb_info); struct hg_cb_info callback_info; @@ -6077,10 +6077,10 @@ HG_TEST_RPC_CB(dart_perform_one_server, handle) dart_perform_one_server_out_t out; hg_bulk_t bulk_handle = HG_BULK_NULL; - uint64_t *n_obj_ids_ptr; + uint64_t * n_obj_ids_ptr; uint64_t n_buf; uint64_t **buf_ptrs; - size_t *buf_sizes; + size_t * buf_sizes; uint32_t i; FUNC_ENTER(NULL); diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index cb6710612..7ee74eb51 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -62,7 +62,7 @@ #include "pdc_logger.h" // Global object region info list in local data server -data_server_region_t *dataserver_region_g = NULL; +data_server_region_t * dataserver_region_g = NULL; data_server_region_unmap_t *dataserver_region_unmap = NULL; int pdc_buffered_bulk_update_total_g = 0; @@ -79,10 +79,10 @@ uint64_t max_mem_cache_size_mb_g = 0; int cache_percentage_g = 0; int current_read_from_cache_cnt_g = 0; int total_read_from_cache_cnt_g = 0; -FILE *pdc_cache_file_ptr_g = NULL; +FILE * pdc_cache_file_ptr_g = NULL; char pdc_cache_file_path_g[ADDR_MAX]; -query_task_t *query_task_list_head_g = NULL; +query_task_t * query_task_list_head_g = NULL; cache_storage_region_t *cache_storage_region_head_g = NULL; static int @@ -263,7 +263,7 @@ PDC_Server_local_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock { perr_t ret_value = SUCCEED; pdc_metadata_t *res_meta; - region_list_t *elt, *request_region; + region_list_t * elt, *request_region; FUNC_ENTER(NULL); @@ -364,7 +364,7 @@ PDC_Server_clear_obj_region() { perr_t ret_value = SUCCEED; data_server_region_t *elt, *tmp; - region_list_t *elt2, *tmp2; + region_list_t * elt2, *tmp2; FUNC_ENTER(NULL); if (dataserver_region_g != NULL) { @@ -473,10 +473,10 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han { perr_t ret_value = SUCCEED; int ndim; - region_list_t *request_region; + region_list_t * request_region; data_server_region_t *new_obj_reg; - region_list_t *elt1, *tmp; - region_buf_map_t *eltt; + region_list_t * elt1, *tmp; + region_buf_map_t * eltt; int error = 0; int found_lock = 0; // time_t t; @@ -577,8 +577,8 @@ perr_t PDC_Server_release_lock_request(uint64_t obj_id, struct pdc_region_info *region) { perr_t ret_value = SUCCEED; - region_list_t *request_region; - region_list_t *elt, *tmp; + region_list_t * request_region; + region_list_t * elt, *tmp; data_server_region_t *new_obj_reg; region_lock_out_t out; @@ -620,7 +620,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) { perr_t ret_value = SUCCEED; int ndim; - region_list_t *tmp1, *tmp2; + region_list_t * tmp1, *tmp2; region_list_t request_region; int found = 0; data_server_region_t *obj_reg = NULL; @@ -759,7 +759,7 @@ PDC_Data_Server_buf_unmap(const struct hg_info *info, buf_unmap_in_t *in) { perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; - region_buf_map_t *tmp, *elt; + region_buf_map_t * tmp, *elt; data_server_region_t *target_obj; FUNC_ENTER(NULL); @@ -853,9 +853,9 @@ PDC_Data_Server_check_unmap() perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; pdcid_t remote_obj_id; - region_buf_map_t *tmp, *elt; + region_buf_map_t * tmp, *elt; data_server_region_unmap_t *tmp1, *elt1; - data_server_region_t *target_obj; + data_server_region_t * target_obj; int completed = 0; FUNC_ENTER(NULL); @@ -954,7 +954,7 @@ buf_unmap_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_unmap_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_unmap_handle; hg_handle_t handle; - struct transfer_buf_unmap *tranx_args; + struct transfer_buf_unmap * tranx_args; int error = 0; FUNC_ENTER(NULL); @@ -1018,7 +1018,7 @@ PDC_Server_buf_unmap_lookup_server_id(int remote_server_id, struct transfer_buf_ lookup_args->server_id = remote_server_id; lookup_args->buf_unmap_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_unmap_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR( @@ -1078,9 +1078,9 @@ PDC_Meta_Server_buf_unmap(buf_unmap_in_t *in, hg_handle_t *handle) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_unmap_handle; struct transfer_buf_unmap_args *buf_unmap_args; - struct transfer_buf_unmap *addr_args; - pdc_metadata_t *target_meta = NULL; - region_buf_map_t *tmp, *elt; + struct transfer_buf_unmap * addr_args; + pdc_metadata_t * target_meta = NULL; + region_buf_map_t * tmp, *elt; int error = 0; FUNC_ENTER(NULL); @@ -1154,14 +1154,14 @@ region_buf_map_t * PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_list_t *request_region, void *data_ptr) { - region_buf_map_t *ret_value = NULL; + region_buf_map_t * ret_value = NULL; data_server_region_t *new_obj_reg = NULL; - region_list_t *elt_reg; - region_buf_map_t *buf_map_ptr = NULL; - region_buf_map_t *tmp; + region_list_t * elt_reg; + region_buf_map_t * buf_map_ptr = NULL; + region_buf_map_t * tmp; int dup = 0; - char *data_path = NULL; - char *user_specified_data_path = NULL; + char * data_path = NULL; + char * user_specified_data_path = NULL; char storage_location[ADDR_MAX]; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; @@ -1277,9 +1277,9 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis void * PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region, size_t type_size) { - void *ret_value = NULL; + void * ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t *tmp; + region_buf_map_t * tmp; FUNC_ENTER(NULL); @@ -1331,9 +1331,9 @@ PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t void * PDC_Server_get_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region) { - void *ret_value = NULL; + void * ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t *tmp; + region_buf_map_t * tmp; FUNC_ENTER(NULL); @@ -1399,7 +1399,7 @@ buf_map_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_map_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_map_handle; hg_handle_t handle; - struct transfer_buf_map *tranx_args; + struct transfer_buf_map * tranx_args; int error = 0; FUNC_ENTER(NULL); @@ -1463,7 +1463,7 @@ PDC_Server_buf_map_lookup_server_id(int remote_server_id, struct transfer_buf_ma lookup_args->server_id = remote_server_id; lookup_args->buf_map_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_map_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR( @@ -1519,9 +1519,9 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_map_handle; struct transfer_buf_map_args *tranx_args = NULL; - struct transfer_buf_map *addr_args; - pdc_metadata_t *target_meta = NULL; - region_buf_map_t *buf_map_ptr; + struct transfer_buf_map * addr_args; + pdc_metadata_t * target_meta = NULL; + region_buf_map_t * buf_map_ptr; int error = 0; FUNC_ENTER(NULL); @@ -1794,11 +1794,11 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; - void **buf_ptrs; - hg_size_t *buf_sizes; + void ** buf_ptrs; + hg_size_t * buf_sizes; bulk_rpc_in_t bulk_rpc_in; int i; - region_list_t *region_elt; + region_list_t * region_elt; notify_multi_io_args_t *bulk_args; FUNC_ENTER(NULL); @@ -2007,7 +2007,7 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * { perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t *region_elt = NULL; + region_list_t * region_elt = NULL; region_list_t r_target; /* uint32_t i; */ @@ -2093,7 +2093,7 @@ PDC_Server_write_check(data_server_write_check_in_t *in, data_server_write_check { perr_t ret_value = FAIL; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t *region_elt = NULL, *region_tmp = NULL; + region_list_t * region_elt = NULL, *region_tmp = NULL; int found_region = 0; FUNC_ENTER(NULL); @@ -2201,7 +2201,7 @@ PDC_Server_get_local_storage_location_of_region(uint64_t obj_id, region_list_t * { perr_t ret_value = SUCCEED; pdc_metadata_t *target_meta = NULL; - region_list_t *region_elt = NULL; + region_list_t * region_elt = NULL; FUNC_ENTER(NULL); @@ -2328,7 +2328,7 @@ PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_cb_info *cal } } // end of if - } // end of if (write_ret->ret == 1) + } // end of if (write_ret->ret == 1) done: @@ -2360,17 +2360,17 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) perr_t ret_value = SUCCEED; uint32_t server_id = 0; uint32_t i, j; - pdc_metadata_t *region_meta = NULL, *region_meta_prev = NULL; - region_list_t *region_elt, req_region, **overlap_regions_2d = NULL; + pdc_metadata_t * region_meta = NULL, *region_meta_prev = NULL; + region_list_t * region_elt, req_region, **overlap_regions_2d = NULL; region_info_transfer_t local_region_transfer[PDC_SERVER_MAX_PROC_PER_NODE]; - region_info_transfer_t *all_requests = NULL; + region_info_transfer_t * all_requests = NULL; update_region_storage_meta_bulk_t *send_buf = NULL; update_region_storage_meta_bulk_t *result_storage_meta = NULL; uint32_t total_request_cnt; int data_size = sizeof(region_info_transfer_t); - int *send_bytes = NULL; - int *displs = NULL; - int *request_overlap_cnt = NULL; + int * send_bytes = NULL; + int * displs = NULL; + int * request_overlap_cnt = NULL; int nrequest_per_server = 0; FUNC_ENTER(NULL); @@ -2698,7 +2698,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_list_elt, *io_list = NULL, *io_list_target = NULL; - region_list_t *region_elt = NULL, *region_tmp; + region_list_t * region_elt = NULL, *region_tmp; int real_bb_cnt = 0, real_lustre_cnt = 0; int write_to_bb_cnt = 0; int count; @@ -3100,7 +3100,7 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) hg_return_t hg_ret; perr_t ret_value = SUCCEED; uint32_t server_id = 0; - pdc_metadata_t *region_meta = NULL; + pdc_metadata_t * region_meta = NULL; hg_handle_t update_region_loc_handle; update_region_loc_in_t in; server_lookup_args_t lookup_args; @@ -3202,7 +3202,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ int i; uint64_t obj_id = 0; update_region_storage_meta_bulk_t *curr_buf_ptr; - uint64_t *obj_id_ptr; + uint64_t * obj_id_ptr; FUNC_ENTER(NULL); @@ -3292,8 +3292,8 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk { perr_t ret_value = SUCCEED; int i; - pdc_metadata_t *target_meta = NULL; - region_list_t *region_elt = NULL, *new_region = NULL; + pdc_metadata_t * target_meta = NULL; + region_list_t * region_elt = NULL, *new_region = NULL; update_region_storage_meta_bulk_t *bulk_ptr; int update_success = 0, express_insert = 0; uint64_t obj_id; @@ -3416,7 +3416,7 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) int i; uint32_t server_id = 0; update_region_storage_meta_bulk_t *recv_buf = NULL; - void **all_meta = NULL; + void ** all_meta = NULL; #endif FUNC_ENTER(NULL); @@ -3469,9 +3469,9 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) } perr_t -PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t *bulk_data, perr_t (*cb)(), +PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * bulk_data, perr_t (*cb)(), update_storage_meta_list_t *meta_list_target, - int *n_updated) + int * n_updated) { hg_return_t hg_ret; perr_t ret_value = SUCCEED; @@ -3712,7 +3712,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re } *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { uint64_t buf_serialize_offset; /* fseek (fp, storage_offset, SEEK_SET); */ @@ -3795,8 +3795,8 @@ PDC_Server_read_one_region(region_list_t *read_region) size_t total_read_bytes = 0; uint32_t n_storage_regions = 0; region_list_t *region_elt; - FILE *fp_read = NULL; - char *prev_path = NULL; + FILE * fp_read = NULL; + char * prev_path = NULL; int is_shm_created = 0, is_read_succeed = 0; #ifdef ENABLE_TIMING double fopen_time; @@ -3939,8 +3939,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) uint64_t offset = 0; uint32_t i = 0; region_list_t *region_elt = NULL, *previous_region = NULL; - FILE *fp_read = NULL, *fp_write = NULL; - char *prev_path = NULL; + FILE * fp_read = NULL, *fp_write = NULL; + char * prev_path = NULL; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; #endif @@ -4400,11 +4400,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, { perr_t ret_value = SUCCEED; data_server_region_t *region = NULL; - region_list_t *overlap_region = NULL; + region_list_t * overlap_region = NULL; int is_contained = 0; uint64_t i, j, pos; - uint64_t *overlap_offset, *overlap_size; - char *tmp_buf; + uint64_t * overlap_offset, *overlap_size; + char * tmp_buf; #if 0 size_t total_write_size = 0, local_write_size; int is_overlap; @@ -4688,11 +4688,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, if (is_contained == 0) { request_region->offset = lseek(region->fd, 0, SEEK_END); #ifdef ENABLE_ZFP - zfp_field *field; + zfp_field * field; zfp_stream *zfp; size_t bufsize; - void *buffer; - bitstream *stream; + void * buffer; + bitstream * stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -4766,10 +4766,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, perr_t ret_value = SUCCEED; ssize_t request_bytes = unit; data_server_region_t *region = NULL; - region_list_t *elt; + region_list_t * elt; uint64_t i, j, pos; - uint64_t *overlap_offset, *overlap_size; - char *tmp_buf; + uint64_t * overlap_offset, *overlap_size; + char * tmp_buf; FUNC_ENTER(NULL); #ifdef PDC_TIMING @@ -4867,10 +4867,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef ENABLE_ZFP // Uncompress the data - zfp_field *field; + zfp_field * field; zfp_stream *zfp; size_t bufsize, decompress_size; - bitstream *stream; + bitstream * stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -5131,7 +5131,7 @@ PDC_Server_get_local_storage_meta_with_one_name(storage_meta_query_one_name_args { perr_t ret_value = SUCCEED; pdc_metadata_t *meta = NULL; - region_list_t *region_elt = NULL, *region_head = NULL, *res_region_list = NULL; + region_list_t * region_elt = NULL, *region_head = NULL, *res_region_list = NULL; int region_count = 0, i = 0; FUNC_ENTER(NULL); @@ -5263,7 +5263,7 @@ PDC_Server_accumulate_storage_meta_then_read(storage_meta_query_one_name_args_t { perr_t ret_value = SUCCEED; accumulate_storage_meta_t *accu_meta; - region_list_t *req_region = NULL, *region_elt = NULL, *read_list_head = NULL; + region_list_t * req_region = NULL, *region_elt = NULL, *read_list_head = NULL; int i, is_sort_read; size_t j; @@ -5431,16 +5431,16 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac { hg_return_t hg_ret = HG_SUCCESS; perr_t ret_value; - storage_meta_name_query_in_t *args; + storage_meta_name_query_in_t * args; storage_meta_query_one_name_args_t *query_args; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; bulk_rpc_in_t bulk_rpc_in; - void **buf_ptrs; - hg_size_t *buf_sizes; + void ** buf_ptrs; + hg_size_t * buf_sizes; uint32_t server_id; - region_info_transfer_t **region_infos; - region_list_t *region_elt; + region_info_transfer_t ** region_infos; + region_list_t * region_elt; int i, j; FUNC_ENTER(NULL); @@ -5583,9 +5583,9 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) { perr_t ret_value = SUCCEED; int i, j; - region_storage_meta_t *storage_metas = (region_storage_meta_t *)buf_cp; + region_storage_meta_t * storage_metas = (region_storage_meta_t *)buf_cp; pdc_data_server_io_list_t *io_list_elt, *io_list_target; - region_list_t *new_region; + region_list_t * new_region; FUNC_ENTER(NULL); @@ -5697,7 +5697,7 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) { perr_t ret_value = SUCCEED; uint64_t offset, read_bytes; - FILE *fp_read = NULL; + FILE * fp_read = NULL; if (region->is_data_ready == 1) return SUCCEED; @@ -5746,9 +5746,9 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) { perr_t ret_value = SUCCEED; region_list_t *region_elt; - char *prev_path = NULL; + char * prev_path = NULL; uint64_t offset, read_bytes; - FILE *fp_read = NULL; + FILE * fp_read = NULL; int read_count = 0; @@ -5887,8 +5887,8 @@ static perr_t PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_combine_op_t combine_op) { perr_t ret_value = SUCCEED; - region_list_t *req_region = NULL, *region_tmp = NULL; - region_list_t *storage_region_list_head = NULL; + region_list_t * req_region = NULL, *region_tmp = NULL; + region_list_t * storage_region_list_head = NULL; pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; uint64_t obj_id; int iter, count, is_same_region, i, can_skip; @@ -6160,7 +6160,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE *edata = (TYPE *)(_data); \ + TYPE * edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -6305,7 +6305,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE *edata = (TYPE *)(_data); \ + TYPE * edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -6466,11 +6466,11 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast char keyName[128]; char offName[128]; char out_name[256]; - double *keys = NULL; - int64_t *offsets = NULL; + double * keys = NULL; + int64_t * offsets = NULL; uint32_t *bms = NULL; uint64_t nk = 0, no = 0, nb = 0; - FILE *fp; + FILE * fp; FUNC_ENTER(NULL); @@ -6568,7 +6568,7 @@ int queryData(const char *name) { uint64_t nhits, i; - uint64_t *buf; + uint64_t * buf; double val1 = 0.0, val2 = 10.0; FastBitSelectionHandle sel1 = fastbit_selection_osr(name, FastBitCompareGreater, val1); FastBitSelectionHandle sel2 = fastbit_selection_osr(name, FastBitCompareLess, val2); @@ -6603,7 +6603,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i char offName[128]; char out_name[256]; uint64_t nk = 0, no = 0, nb = 0, size; - FILE *fp; + FILE * fp; PDC_gen_fastbit_idx_name(bmsName, "bms", obj_id, timestep, ndim, start, count); PDC_gen_fastbit_idx_name(keyName, "key", obj_id, timestep, ndim, start, count); @@ -6679,9 +6679,9 @@ PDC_query_fastbit_idx(region_list_t *region, pdc_query_constraint_t *constraint, perr_t ret_value = SUCCEED; FastBitDataType ft = 0; uint64_t type_size; - uint32_t *bms = NULL; - double *keys = NULL; - int64_t *offsets = NULL; + uint32_t * bms = NULL; + double * keys = NULL; + int64_t * offsets = NULL; int timestep; double v1, v2; size_t i; @@ -6857,7 +6857,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ pdc_query_combine_op_t combine_op) { perr_t ret_value = SUCCEED; - region_list_t *region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; + region_list_t * region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; pdc_selection_t *sel = query->sel; uint64_t nelem; size_t i, j, unit_size; @@ -6871,7 +6871,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ uint32_t ulo = 0, uhi = 0; int64_t i64lo = 0, i64hi = 0; uint64_t ui64lo = 0, ui64hi = 0; - void *value = NULL, *buf = NULL; + void * value = NULL, *buf = NULL; int n_eval_region = 0, can_skip, region_iter = 0; LOG_INFO("==PDC_SERVER[%d]: start query evaluation!\n", pdc_server_rank_g); @@ -7212,7 +7212,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ n_eval_region++; } // End DL_FOREACH - } // End not use fastbit + } // End not use fastbit if (n_eval_region == 0 && combine_op == PDC_QUERY_AND) { if (sel->nhits > 0) { @@ -7540,7 +7540,7 @@ PDC_Server_send_coords_to_client(query_task_t *task) hg_bulk_t bulk_handle; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; int client_id; FUNC_ENTER(NULL); @@ -7622,7 +7622,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; int server_id; FUNC_ENTER(NULL); @@ -7829,9 +7829,9 @@ hg_return_t PDC_Server_read_coords(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; - query_task_t *task = (query_task_t *)callback_info->arg; + query_task_t * task = (query_task_t *)callback_info->arg; pdc_query_constraint_t *constraint; - region_list_t *storage_region_head, *region_elt, *cache_region; + region_list_t * storage_region_head, *region_elt, *cache_region; size_t ndim, unit_size; uint64_t i, *coord, data_off, buf_off, my_size; @@ -7897,11 +7897,11 @@ PDC_recv_read_coords(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t *task_elt = NULL; + query_task_t * task_elt = NULL; uint64_t nhits, obj_id; uint32_t ndim; int query_id, origin; - void *buf; + void * buf; pdc_int_ret_t out; out.ret = 1; @@ -7980,7 +7980,7 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t *task_elt; + query_task_t * task_elt; uint64_t nhits = 0, total_hits; size_t ndim, unit_size; int i, query_id, origin, found_task; @@ -8394,8 +8394,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in { pdc_metadata_t *meta = NULL; int i, server_id, count, avg_count, nsent, nsent_server; - region_list_t *elt, *new_region = NULL; - void *region_bulk_buf; + region_list_t * elt, *new_region = NULL; + void * region_bulk_buf; uint64_t buf_alloc = 0, buf_off = 0; bulk_rpc_in_t header; @@ -8535,16 +8535,16 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - void *buf; - region_list_t *regions = NULL; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; + void * buf; + region_list_t * regions = NULL; int i, nregion, *loc_len_ptr, *has_hist_ptr, found_task; uint64_t buf_off, *offset_ptr = NULL, *size_ptr = NULL; - char *loc_ptr = NULL; + char * loc_ptr = NULL; region_info_transfer_t *region_info_ptr = NULL; - pdc_histogram_t *hist_ptr = NULL; - query_task_t *task_elt = NULL; - pdc_query_t *query = NULL; + pdc_histogram_t * hist_ptr = NULL; + query_task_t * task_elt = NULL; + pdc_query_t * query = NULL; pdc_int_ret_t out; out.ret = 1; @@ -8713,10 +8713,10 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; pdc_query_xfer_t *query_xfer = (pdc_query_xfer_t *)callback_info->arg; int obj_idx = 0; - uint64_t *obj_ids; - query_task_t *new_task = NULL, *task_elt; + uint64_t * obj_ids; + query_task_t * new_task = NULL, *task_elt; int query_id_exist = 0; - pdc_query_t *query; + pdc_query_t * query; query = PDC_deserialize_query(query_xfer); if (NULL == query) { @@ -8822,7 +8822,7 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; FUNC_ENTER(NULL); @@ -8933,12 +8933,12 @@ hg_return_t PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; - get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t *task_elt, *task = NULL; + get_sel_data_rpc_in_t * in = (get_sel_data_rpc_in_t *)callback_info->arg; + query_task_t * task_elt, *task = NULL; uint64_t nhits, *coord, *coords = NULL, obj_id, buf_off, my_size, data_off, i; size_t ndim, unit_size; cache_storage_region_t *cache_region_elt; - region_list_t *storage_region_head = NULL, *cache_region, *region_elt; + region_list_t * storage_region_head = NULL, *cache_region, *region_elt; pdc_var_type_t data_type; // find task @@ -9026,8 +9026,8 @@ PDC_Server_recv_get_sel_data(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t *task_elt, *task = NULL; - pdc_metadata_t *meta; + query_task_t * task_elt, *task = NULL; + pdc_metadata_t * meta; struct hg_cb_info fake_callback_info = {0}; DL_FOREACH(query_task_list_head_g, task_elt) diff --git a/src/server/pdc_server_region/pdc_server_region_transfer.c b/src/server/pdc_server_region/pdc_server_region_transfer.c index ad64b0047..62799d3a8 100644 --- a/src/server/pdc_server_region/pdc_server_region_transfer.c +++ b/src/server/pdc_server_region/pdc_server_region_transfer.c @@ -79,7 +79,7 @@ PDC_commit_request(uint64_t transfer_request_id) perr_t PDC_finish_request(uint64_t transfer_request_id) { - pdc_transfer_request_status *ptr, *tmp = NULL; + pdc_transfer_request_status * ptr, *tmp = NULL; perr_t ret_value = SUCCEED; transfer_request_wait_out_t out; transfer_request_wait_all_out_t out_all; @@ -264,8 +264,8 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob { perr_t ret_value = SUCCEED; int fd; - char *data_path = NULL; - char *user_specified_data_path = NULL; + char * data_path = NULL; + char * user_specified_data_path = NULL; char storage_location[ADDR_MAX]; ssize_t io_size; uint64_t i, j; @@ -393,7 +393,7 @@ clean_write_bulk_data(transfer_request_all_data *request_data) int parse_bulk_data(void *buf, transfer_request_all_data *request_data, pdc_access_t access_type) { - char *ptr = (char *)buf; + char * ptr = (char *)buf; int i, j; uint64_t data_size; From b19d91fe99a2fa7e20baaf8a7acb442682cebc73 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 17 May 2025 14:35:20 -0700 Subject: [PATCH 38/43] test --- src/server/pdc_server_region/pdc_server_data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index cb6710612..80229de3a 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -1925,7 +1925,8 @@ PDC_Server_cache_region_to_BB(region_list_t *region) bb_data_path); } - pdc_cache_file_ptr_g = fopen(pdc_cache_file_path_g, "ab"); + int fd = open(pdc_cache_file_path_g, O_RDWR | O_CREAT, 0644); + pdc_cache_file_ptr_g = fdopen(fd, "wb"); if (NULL == pdc_cache_file_ptr_g) { LOG_ERROR("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, pdc_cache_file_path_g); ret_value = FAIL; From 485266626997c0f1772fa58df16bccbbd27a4e76 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 17 May 2025 14:57:59 -0700 Subject: [PATCH 39/43] checkpoint --- .../dart/index/idioms/idioms_persistence.c | 26 +- src/commons/logging/pdc_logger.c | 8 +- src/server/pdc_server.c | 69 ++--- .../pdc_server_region/pdc_server_data.c | 251 +++++++++--------- 4 files changed, 183 insertions(+), 171 deletions(-) diff --git a/src/commons/index/dart/index/idioms/idioms_persistence.c b/src/commons/index/dart/index/idioms/idioms_persistence.c index a7e012825..ac246e23a 100644 --- a/src/commons/index/dart/index/idioms/idioms_persistence.c +++ b/src/commons/index/dart/index/idioms/idioms_persistence.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include "bulki_serde.h" /****************************/ @@ -33,7 +35,7 @@ append_obj_id_set(Set *obj_id_set, BULKI_Entity *id_set_entity) SetIterator iter; set_iterate(obj_id_set, &iter); while (set_iter_has_more(&iter)) { - uint64_t * item = (uint64_t *)set_iter_next(&iter); + uint64_t *item = (uint64_t *)set_iter_next(&iter); BULKI_Entity *id_entity = BULKI_ENTITY(item, 1, PDC_UINT64, PDC_CLS_ITEM); BULKI_ENTITY_append_BULKI_Entity(id_set_entity, id_entity); } @@ -119,7 +121,7 @@ append_attr_name_node(void *data, const unsigned char *key, uint32_t key_len, vo int rst = 0; key_index_leaf_content_t *leafcnt = (key_index_leaf_content_t *)value; - HashTable * vnode_buf_ht = (HashTable *)data; // data is the parameter passed in + HashTable *vnode_buf_ht = (HashTable *)data; // data is the parameter passed in // the hash table is used to store the buffer struct related to each vnode id. BULKI *kv_bulki = hash_table_lookup(vnode_buf_ht, &(leafcnt->virtural_node_id)); // index_buffer_t *buffer = hash_table_lookup(vnode_buf_ht, &(leafcnt->virtural_node_id)); @@ -190,12 +192,13 @@ dump_attr_root_tree(art_tree *art, char *dir_path, char *base_name, uint32_t ser HashTablePair pair = hash_table_iter_next(&iter); // vnode ID. On different server, there can be the same vnode ID at this line below uint64_t *vid = pair.key; - BULKI * bulki = pair.value; + BULKI *bulki = pair.value; char file_name[1024]; // and this is why do we need to differentiate the file name by the server ID. sprintf(file_name, "%s/%s_%" PRIu32 "_%" PRIu64 ".bin", dir_path, base_name, serverID, *vid); LOG_INFO("Writing index to file_name: %s\n", file_name); - FILE *stream = fopen(file_name, "wb"); + int fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644); + FILE *stream = fdopen(fd, "wb"); BULKI_serialize_to_file(bulki, stream); } return rst; @@ -208,7 +211,8 @@ dump_dart_info(DART *dart, char *dir_path, uint32_t serverID) char file_name[1024]; sprintf(file_name, "%s/%s.bin", dir_path, "dart_info"); LOG_INFO("Writing DART info to file_name: %s\n", file_name); - FILE * stream = fopen(file_name, "wb"); + int fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644); + FILE *stream = fdopen(fd, "wb"); BULKI_Entity *dart_ent = empty_Bent_Array_Entity(); BULKI_ENTITY_append_BULKI_Entity(dart_ent, BULKI_ENTITY(&(dart->alphabet_size), 1, PDC_INT, PDC_CLS_ITEM)); @@ -256,7 +260,7 @@ fill_set_from_BULKI_Entity(value_index_leaf_content_t *value_index_leaf, BULKI_E BULKI_Entity_Iterator *it = Bent_iterator_init(data_entity, NULL, PDC_UNKNOWN); while (Bent_iterator_has_next_Bent(it)) { BULKI_Entity *id_entity = Bent_iterator_next_Bent(it); - uint64_t * obj_id = calloc(1, sizeof(uint64_t)); + uint64_t *obj_id = calloc(1, sizeof(uint64_t)); memcpy(obj_id, id_entity->data, sizeof(uint64_t)); set_insert(value_index_leaf->obj_id_set, obj_id); value_index_leaf->indexed_item_count++; @@ -273,8 +277,8 @@ read_attr_value_node(key_index_leaf_content_t *leaf_cnt, int value_tree_idx, BUL BULKI_KV_Pair_Iterator *it = BULKI_KV_Pair_iterator_init(v_id_bulki); while (BULKI_KV_Pair_iterator_has_next(it)) { BULKI_KV_Pair *kv_pair = BULKI_KV_Pair_iterator_next(it); - BULKI_Entity * key_entity = &(kv_pair->key); - BULKI_Entity * data_entity = &(kv_pair->value); + BULKI_Entity *key_entity = &(kv_pair->key); + BULKI_Entity *data_entity = &(kv_pair->value); value_index_leaf_content_t *value_index_leaf = (value_index_leaf_content_t *)calloc(1, sizeof(value_index_leaf_content_t)); @@ -379,8 +383,8 @@ read_attr_name_node(IDIOMS_t *idioms, char *dir_path, char *base_name, uint32_t BULKI_KV_Pair_Iterator *it = BULKI_KV_Pair_iterator_init(bulki); while (BULKI_KV_Pair_iterator_has_next(it)) { BULKI_KV_Pair *kv_pair = BULKI_KV_Pair_iterator_next(it); - BULKI_Entity * key_entity = &(kv_pair->key); - BULKI_Entity * data_entity = &(kv_pair->value); + BULKI_Entity *key_entity = &(kv_pair->key); + BULKI_Entity *data_entity = &(kv_pair->value); key_index_leaf_content_t *leafcnt = (key_index_leaf_content_t *)calloc(1, sizeof(key_index_leaf_content_t)); @@ -429,7 +433,7 @@ load_dart_info(DART *dart, char *dir_path, uint32_t serverID) if (stream == NULL) { return; } - BULKI_Entity * dart_ent = BULKI_Entity_deserialize_from_file(stream); + BULKI_Entity *dart_ent = BULKI_Entity_deserialize_from_file(stream); BULKI_Entity_Iterator *it = Bent_iterator_init(dart_ent, NULL, PDC_UNKNOWN); int i = 0; while (Bent_iterator_has_next_Bent(it)) { diff --git a/src/commons/logging/pdc_logger.c b/src/commons/logging/pdc_logger.c index 0d93221e8..9bf6851c6 100644 --- a/src/commons/logging/pdc_logger.c +++ b/src/commons/logging/pdc_logger.c @@ -2,6 +2,8 @@ #include #include #include +#include +#include void setLogFile(PDC_LogLevel level, const char *fileName) @@ -20,7 +22,8 @@ setLogFile(PDC_LogLevel level, const char *fileName) else { strncpy(logFilenames[level], fileName, sizeof(logFilenames[level]) - 1); logFilenames[level][sizeof(logFilenames[level]) - 1] = '\0'; - logFiles[level] = fopen(fileName, "a"); + int fd = open(fileName, O_WRONLY | O_CREAT | O_APPEND, 0644); + logFiles[level] = fdopen(fd, "a"); } } else { @@ -58,7 +61,8 @@ rotate_log_file(PDC_LogLevel level) snprintf(newFilename, MAX_LOG_FILE_NAME_LENGTH, "%s_%s", logFilenames[level], timeStr); rename(logFilenames[level], newFilename); - logFiles[level] = fopen(logFilenames[level], "a"); + int fd = open(logFilenames[level], O_WRONLY | O_CREAT | O_APPEND, 0644); + logFiles[level] = fdopen(fd, "a"); } static FILE * diff --git a/src/server/pdc_server.c b/src/server/pdc_server.c index 7ec555db9..292d139ca 100644 --- a/src/server/pdc_server.c +++ b/src/server/pdc_server.c @@ -82,7 +82,7 @@ sqlite3 *sqlite3_db_g; int is_debug_g = 0; int pdc_client_num_g = 0; -hg_class_t * hg_class_g = NULL; +hg_class_t *hg_class_g = NULL; hg_context_t *hg_context_g = NULL; // Below three are guarded by pdc_server_task_mutex_g for multi-thread @@ -90,10 +90,10 @@ pdc_task_list_t *pdc_server_agg_task_head_g = NULL; pdc_task_list_t *pdc_server_s2s_task_head_g = NULL; int pdc_server_task_id_g = PDC_SERVER_TASK_INIT_VALUE; -pdc_client_info_t * pdc_client_info_g = NULL; +pdc_client_info_t *pdc_client_info_g = NULL; pdc_remote_server_info_t *pdc_remote_server_info_g = NULL; -char * all_addr_strings_1d_g = NULL; -char ** all_addr_strings_g = NULL; +char *all_addr_strings_1d_g = NULL; +char **all_addr_strings_g = NULL; int is_hash_table_init_g = 0; int lustre_stripe_size_mb_g = 16; int lustre_total_ost_g = 0; @@ -146,7 +146,7 @@ int gen_fastbit_idx_g = 0; int use_fastbit_idx_g = 0; int use_rocksdb_g = 0; int use_sqlite3_g = 0; -char * gBinningOption = NULL; +char *gBinningOption = NULL; double server_write_time_g = 0.0; double server_read_time_g = 0.0; @@ -164,9 +164,9 @@ volatile int dbg_sleep_g = 1; double total_mem_usage_g = 0.0; // Data server related -pdc_data_server_io_list_t * pdc_data_server_read_list_head_g = NULL; -pdc_data_server_io_list_t * pdc_data_server_write_list_head_g = NULL; -update_storage_meta_list_t * pdc_update_storage_meta_list_head_g = NULL; +pdc_data_server_io_list_t *pdc_data_server_read_list_head_g = NULL; +pdc_data_server_io_list_t *pdc_data_server_write_list_head_g = NULL; +update_storage_meta_list_t *pdc_update_storage_meta_list_head_g = NULL; extern data_server_region_t *dataserver_region_g; /* @@ -357,7 +357,8 @@ PDC_Server_write_addr_to_file(char **addr_strings, int n) // write to file snprintf(config_fname, ADDR_MAX, "%s%s", pdc_server_tmp_dir_g, pdc_server_cfg_name_g); - FILE *na_config = fopen(config_fname, "w+"); + int fd = open(config_fname, O_RDWR | O_CREAT | O_TRUNC, 0644); + FILE *na_config = fdopen(fd, "w+"); if (!na_config) { LOG_ERROR("Could not open config file from: %s\n", config_fname); goto done; @@ -378,7 +379,7 @@ static int remove_directory(const char *dir) { int ret = 0; - FTS * ftsp = NULL; + FTS *ftsp = NULL; FTSENT *curr; // Cast needed (in C) because fts_open() takes a "char * const *", instead @@ -542,7 +543,7 @@ PDC_Server_lookup_server_id(int remote_server_id) lookup_args->server_id = remote_server_id; hg_ret = HG_Addr_lookup(hg_context_g, lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { LOG_ERROR("==PDC_SERVER: Connection to remote server FAILED!\n"); ret_value = FAIL; @@ -662,7 +663,7 @@ PDC_Server_lookup_client(uint32_t client_id) // Lookup and fill the client info server_lookup_args_t lookup_args; - char * target_addr_string; + char *target_addr_string; lookup_args.server_id = pdc_server_rank_g; lookup_args.client_id = client_id; @@ -798,7 +799,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) uint32_t credential = 0, cookie; drc_info_handle_t credential_info; char pdc_auth_key[256] = {'\0'}; - char * auth_key; + char *auth_key; int rc; #endif @@ -1050,7 +1051,7 @@ perr_t PDC_Server_finalize() { pdc_data_server_io_list_t *io_elt = NULL; - region_list_t * region_elt = NULL, *region_tmp = NULL; + region_list_t *region_elt = NULL, *region_tmp = NULL; perr_t ret_value = SUCCEED; hg_return_t hg_ret; @@ -1216,21 +1217,21 @@ perr_t PDC_Server_checkpoint() { perr_t ret_value = SUCCEED; - pdc_metadata_t * elt; - region_list_t * region_elt; - pdc_kvtag_list_t * kvlist_elt; - pdc_hash_table_entry_head * head; + pdc_metadata_t *elt; + region_list_t *region_elt; + pdc_kvtag_list_t *kvlist_elt; + pdc_hash_table_entry_head *head; pdc_cont_hash_table_entry_t *cont_head; int n_entry, metadata_size = 0, region_count = 0, n_region, n_objs, n_write_region = 0, n_kvtag, key_len; uint32_t hash_key; HashTablePair pair; char checkpoint_file[ADDR_MAX], checkpoint_file_local[ADDR_MAX], cmd[4096]; HashTableIterator hash_table_iter; - char * checkpoint; - char * env_char; + char *checkpoint; + char *env_char; uint64_t checkpoint_size; bool use_tmpfs = false; - FILE * file; + FILE *file; FUNC_ENTER(NULL); @@ -1262,10 +1263,12 @@ PDC_Server_checkpoint() fflush(stdout); } + int fd; if (use_tmpfs) - file = fopen(checkpoint_file_local, "w+"); + fd = open(checkpoint_file_local, O_RDWR | O_CREAT | O_TRUNC, 0644); else - file = fopen(checkpoint_file, "w+"); + fd = open(checkpoint_file, O_RDWR | O_CREAT | O_TRUNC, 0644); + file = fdopen(fd, "w+"); if (file == NULL) { LOG_ERROR("==PDC_SERVER[%d]: Checkpoint file open error", pdc_server_rank_g); @@ -1351,7 +1354,7 @@ PDC_Server_checkpoint() metadata_size++; region_count += n_region; } // End for metadata entry linked list - } // End for hash table metadata entry + } // End for hash table metadata entry // Note data server region are managed by data server instead of metadata server data_server_region_t *region = NULL; @@ -1445,14 +1448,14 @@ PDC_Server_restart(char *filename) int n_entry, count, i, j, nobj = 0, all_nobj = 0, all_n_region, n_region, n_objs, total_region = 0, n_kvtag, key_len; int n_cont, all_cont; - pdc_metadata_t * metadata, *elt; - region_list_t * region_list; - pdc_hash_table_entry_head * entry; + pdc_metadata_t *metadata, *elt; + region_list_t *region_list; + pdc_hash_table_entry_head *entry; pdc_cont_hash_table_entry_t *cont_entry; - uint32_t * hash_key; + uint32_t *hash_key; unsigned idx; uint64_t checkpoint_size; - char * checkpoint_buf; + char *checkpoint_buf; #ifdef PDC_TIMING double start = MPI_Wtime(); #endif @@ -1733,8 +1736,8 @@ PDC_Server_restart(char *filename) MPI_Reduce(&nobj, &all_nobj, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&total_region, &all_n_region, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); #else - all_nobj = nobj; - all_n_region = total_region; + all_nobj = nobj; + all_n_region = total_region; #endif if (pdc_server_rank_g == 0) { @@ -1762,7 +1765,7 @@ PDC_Server_restart(char *filename) static HG_THREAD_RETURN_TYPE hg_progress_thread(void *arg) { - hg_context_t * context = (hg_context_t *)arg; + hg_context_t *context = (hg_context_t *)arg; HG_THREAD_RETURN_TYPE tret = (HG_THREAD_RETURN_TYPE)0; hg_return_t ret = HG_SUCCESS; @@ -2247,7 +2250,7 @@ server_run(int argc, char *argv[]) rocksdb_options_set_create_if_missing(options, 1); rocksdb_block_based_table_options_t *table_options = rocksdb_block_based_options_create(); - rocksdb_filterpolicy_t * filter_policy = rocksdb_filterpolicy_create_bloom(10); + rocksdb_filterpolicy_t *filter_policy = rocksdb_filterpolicy_create_bloom(10); rocksdb_block_based_options_set_filter_policy(table_options, filter_policy); rocksdb_options_set_block_based_table_factory(options, table_options); diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 29926e69a..af173fb7a 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -62,7 +62,7 @@ #include "pdc_logger.h" // Global object region info list in local data server -data_server_region_t * dataserver_region_g = NULL; +data_server_region_t *dataserver_region_g = NULL; data_server_region_unmap_t *dataserver_region_unmap = NULL; int pdc_buffered_bulk_update_total_g = 0; @@ -79,10 +79,10 @@ uint64_t max_mem_cache_size_mb_g = 0; int cache_percentage_g = 0; int current_read_from_cache_cnt_g = 0; int total_read_from_cache_cnt_g = 0; -FILE * pdc_cache_file_ptr_g = NULL; +FILE *pdc_cache_file_ptr_g = NULL; char pdc_cache_file_path_g[ADDR_MAX]; -query_task_t * query_task_list_head_g = NULL; +query_task_t *query_task_list_head_g = NULL; cache_storage_region_t *cache_storage_region_head_g = NULL; static int @@ -263,7 +263,7 @@ PDC_Server_local_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock { perr_t ret_value = SUCCEED; pdc_metadata_t *res_meta; - region_list_t * elt, *request_region; + region_list_t *elt, *request_region; FUNC_ENTER(NULL); @@ -364,7 +364,7 @@ PDC_Server_clear_obj_region() { perr_t ret_value = SUCCEED; data_server_region_t *elt, *tmp; - region_list_t * elt2, *tmp2; + region_list_t *elt2, *tmp2; FUNC_ENTER(NULL); if (dataserver_region_g != NULL) { @@ -473,10 +473,10 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han { perr_t ret_value = SUCCEED; int ndim; - region_list_t * request_region; + region_list_t *request_region; data_server_region_t *new_obj_reg; - region_list_t * elt1, *tmp; - region_buf_map_t * eltt; + region_list_t *elt1, *tmp; + region_buf_map_t *eltt; int error = 0; int found_lock = 0; // time_t t; @@ -577,8 +577,8 @@ perr_t PDC_Server_release_lock_request(uint64_t obj_id, struct pdc_region_info *region) { perr_t ret_value = SUCCEED; - region_list_t * request_region; - region_list_t * elt, *tmp; + region_list_t *request_region; + region_list_t *elt, *tmp; data_server_region_t *new_obj_reg; region_lock_out_t out; @@ -620,7 +620,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) { perr_t ret_value = SUCCEED; int ndim; - region_list_t * tmp1, *tmp2; + region_list_t *tmp1, *tmp2; region_list_t request_region; int found = 0; data_server_region_t *obj_reg = NULL; @@ -759,7 +759,7 @@ PDC_Data_Server_buf_unmap(const struct hg_info *info, buf_unmap_in_t *in) { perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; - region_buf_map_t * tmp, *elt; + region_buf_map_t *tmp, *elt; data_server_region_t *target_obj; FUNC_ENTER(NULL); @@ -853,9 +853,9 @@ PDC_Data_Server_check_unmap() perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; pdcid_t remote_obj_id; - region_buf_map_t * tmp, *elt; + region_buf_map_t *tmp, *elt; data_server_region_unmap_t *tmp1, *elt1; - data_server_region_t * target_obj; + data_server_region_t *target_obj; int completed = 0; FUNC_ENTER(NULL); @@ -954,7 +954,7 @@ buf_unmap_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_unmap_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_unmap_handle; hg_handle_t handle; - struct transfer_buf_unmap * tranx_args; + struct transfer_buf_unmap *tranx_args; int error = 0; FUNC_ENTER(NULL); @@ -1018,7 +1018,7 @@ PDC_Server_buf_unmap_lookup_server_id(int remote_server_id, struct transfer_buf_ lookup_args->server_id = remote_server_id; lookup_args->buf_unmap_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_unmap_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR( @@ -1078,9 +1078,9 @@ PDC_Meta_Server_buf_unmap(buf_unmap_in_t *in, hg_handle_t *handle) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_unmap_handle; struct transfer_buf_unmap_args *buf_unmap_args; - struct transfer_buf_unmap * addr_args; - pdc_metadata_t * target_meta = NULL; - region_buf_map_t * tmp, *elt; + struct transfer_buf_unmap *addr_args; + pdc_metadata_t *target_meta = NULL; + region_buf_map_t *tmp, *elt; int error = 0; FUNC_ENTER(NULL); @@ -1154,14 +1154,14 @@ region_buf_map_t * PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_list_t *request_region, void *data_ptr) { - region_buf_map_t * ret_value = NULL; + region_buf_map_t *ret_value = NULL; data_server_region_t *new_obj_reg = NULL; - region_list_t * elt_reg; - region_buf_map_t * buf_map_ptr = NULL; - region_buf_map_t * tmp; + region_list_t *elt_reg; + region_buf_map_t *buf_map_ptr = NULL; + region_buf_map_t *tmp; int dup = 0; - char * data_path = NULL; - char * user_specified_data_path = NULL; + char *data_path = NULL; + char *user_specified_data_path = NULL; char storage_location[ADDR_MAX]; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; @@ -1277,9 +1277,9 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis void * PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region, size_t type_size) { - void * ret_value = NULL; + void *ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t * tmp; + region_buf_map_t *tmp; FUNC_ENTER(NULL); @@ -1331,9 +1331,9 @@ PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t void * PDC_Server_get_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region) { - void * ret_value = NULL; + void *ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t * tmp; + region_buf_map_t *tmp; FUNC_ENTER(NULL); @@ -1399,7 +1399,7 @@ buf_map_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_map_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_map_handle; hg_handle_t handle; - struct transfer_buf_map * tranx_args; + struct transfer_buf_map *tranx_args; int error = 0; FUNC_ENTER(NULL); @@ -1463,7 +1463,7 @@ PDC_Server_buf_map_lookup_server_id(int remote_server_id, struct transfer_buf_ma lookup_args->server_id = remote_server_id; lookup_args->buf_map_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_map_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR( @@ -1519,9 +1519,9 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_map_handle; struct transfer_buf_map_args *tranx_args = NULL; - struct transfer_buf_map * addr_args; - pdc_metadata_t * target_meta = NULL; - region_buf_map_t * buf_map_ptr; + struct transfer_buf_map *addr_args; + pdc_metadata_t *target_meta = NULL; + region_buf_map_t *buf_map_ptr; int error = 0; FUNC_ENTER(NULL); @@ -1794,11 +1794,11 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; - void ** buf_ptrs; - hg_size_t * buf_sizes; + void **buf_ptrs; + hg_size_t *buf_sizes; bulk_rpc_in_t bulk_rpc_in; int i; - region_list_t * region_elt; + region_list_t *region_elt; notify_multi_io_args_t *bulk_args; FUNC_ENTER(NULL); @@ -1925,7 +1925,7 @@ PDC_Server_cache_region_to_BB(region_list_t *region) bb_data_path); } - int fd = open(pdc_cache_file_path_g, O_RDWR | O_CREAT, 0644); + int fd = open(pdc_cache_file_path_g, O_WRONLY | O_CREAT | O_TRUNC, 0644); pdc_cache_file_ptr_g = fdopen(fd, "wb"); if (NULL == pdc_cache_file_ptr_g) { LOG_ERROR("==PDC_SERVER[%d]: fopen failed [%s]\n", pdc_server_rank_g, pdc_cache_file_path_g); @@ -2008,7 +2008,7 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * { perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t * region_elt = NULL; + region_list_t *region_elt = NULL; region_list_t r_target; /* uint32_t i; */ @@ -2094,7 +2094,7 @@ PDC_Server_write_check(data_server_write_check_in_t *in, data_server_write_check { perr_t ret_value = FAIL; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t * region_elt = NULL, *region_tmp = NULL; + region_list_t *region_elt = NULL, *region_tmp = NULL; int found_region = 0; FUNC_ENTER(NULL); @@ -2202,7 +2202,7 @@ PDC_Server_get_local_storage_location_of_region(uint64_t obj_id, region_list_t * { perr_t ret_value = SUCCEED; pdc_metadata_t *target_meta = NULL; - region_list_t * region_elt = NULL; + region_list_t *region_elt = NULL; FUNC_ENTER(NULL); @@ -2329,7 +2329,7 @@ PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_cb_info *cal } } // end of if - } // end of if (write_ret->ret == 1) + } // end of if (write_ret->ret == 1) done: @@ -2361,17 +2361,17 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) perr_t ret_value = SUCCEED; uint32_t server_id = 0; uint32_t i, j; - pdc_metadata_t * region_meta = NULL, *region_meta_prev = NULL; - region_list_t * region_elt, req_region, **overlap_regions_2d = NULL; + pdc_metadata_t *region_meta = NULL, *region_meta_prev = NULL; + region_list_t *region_elt, req_region, **overlap_regions_2d = NULL; region_info_transfer_t local_region_transfer[PDC_SERVER_MAX_PROC_PER_NODE]; - region_info_transfer_t * all_requests = NULL; + region_info_transfer_t *all_requests = NULL; update_region_storage_meta_bulk_t *send_buf = NULL; update_region_storage_meta_bulk_t *result_storage_meta = NULL; uint32_t total_request_cnt; int data_size = sizeof(region_info_transfer_t); - int * send_bytes = NULL; - int * displs = NULL; - int * request_overlap_cnt = NULL; + int *send_bytes = NULL; + int *displs = NULL; + int *request_overlap_cnt = NULL; int nrequest_per_server = 0; FUNC_ENTER(NULL); @@ -2699,7 +2699,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_list_elt, *io_list = NULL, *io_list_target = NULL; - region_list_t * region_elt = NULL, *region_tmp; + region_list_t *region_elt = NULL, *region_tmp; int real_bb_cnt = 0, real_lustre_cnt = 0; int write_to_bb_cnt = 0; int count; @@ -3101,7 +3101,7 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) hg_return_t hg_ret; perr_t ret_value = SUCCEED; uint32_t server_id = 0; - pdc_metadata_t * region_meta = NULL; + pdc_metadata_t *region_meta = NULL; hg_handle_t update_region_loc_handle; update_region_loc_in_t in; server_lookup_args_t lookup_args; @@ -3203,7 +3203,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ int i; uint64_t obj_id = 0; update_region_storage_meta_bulk_t *curr_buf_ptr; - uint64_t * obj_id_ptr; + uint64_t *obj_id_ptr; FUNC_ENTER(NULL); @@ -3293,8 +3293,8 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk { perr_t ret_value = SUCCEED; int i; - pdc_metadata_t * target_meta = NULL; - region_list_t * region_elt = NULL, *new_region = NULL; + pdc_metadata_t *target_meta = NULL; + region_list_t *region_elt = NULL, *new_region = NULL; update_region_storage_meta_bulk_t *bulk_ptr; int update_success = 0, express_insert = 0; uint64_t obj_id; @@ -3417,7 +3417,7 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) int i; uint32_t server_id = 0; update_region_storage_meta_bulk_t *recv_buf = NULL; - void ** all_meta = NULL; + void **all_meta = NULL; #endif FUNC_ENTER(NULL); @@ -3470,9 +3470,9 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) } perr_t -PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * bulk_data, perr_t (*cb)(), +PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t *bulk_data, perr_t (*cb)(), update_storage_meta_list_t *meta_list_target, - int * n_updated) + int *n_updated) { hg_return_t hg_ret; perr_t ret_value = SUCCEED; @@ -3713,7 +3713,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re } *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { uint64_t buf_serialize_offset; /* fseek (fp, storage_offset, SEEK_SET); */ @@ -3796,8 +3796,8 @@ PDC_Server_read_one_region(region_list_t *read_region) size_t total_read_bytes = 0; uint32_t n_storage_regions = 0; region_list_t *region_elt; - FILE * fp_read = NULL; - char * prev_path = NULL; + FILE *fp_read = NULL; + char *prev_path = NULL; int is_shm_created = 0, is_read_succeed = 0; #ifdef ENABLE_TIMING double fopen_time; @@ -3940,8 +3940,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) uint64_t offset = 0; uint32_t i = 0; region_list_t *region_elt = NULL, *previous_region = NULL; - FILE * fp_read = NULL, *fp_write = NULL; - char * prev_path = NULL; + FILE *fp_read = NULL, *fp_write = NULL; + char *prev_path = NULL; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; #endif @@ -4171,7 +4171,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) // Open current file as binary and append only, it is guarenteed that only current // server process access this file, so no lock is needed. - fp_write = fopen(region_elt->storage_location, "ab"); + int fd = open(region_elt->storage_location, O_WRONLY | O_CREAT | O_APPEND, 0666); + fp_write = fdopen(fd, "ab"); n_fopen_g++; #ifdef ENABLE_TIMING @@ -4401,11 +4402,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, { perr_t ret_value = SUCCEED; data_server_region_t *region = NULL; - region_list_t * overlap_region = NULL; + region_list_t *overlap_region = NULL; int is_contained = 0; uint64_t i, j, pos; - uint64_t * overlap_offset, *overlap_size; - char * tmp_buf; + uint64_t *overlap_offset, *overlap_size; + char *tmp_buf; #if 0 size_t total_write_size = 0, local_write_size; int is_overlap; @@ -4689,11 +4690,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, if (is_contained == 0) { request_region->offset = lseek(region->fd, 0, SEEK_END); #ifdef ENABLE_ZFP - zfp_field * field; + zfp_field *field; zfp_stream *zfp; size_t bufsize; - void * buffer; - bitstream * stream; + void *buffer; + bitstream *stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -4767,10 +4768,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, perr_t ret_value = SUCCEED; ssize_t request_bytes = unit; data_server_region_t *region = NULL; - region_list_t * elt; + region_list_t *elt; uint64_t i, j, pos; - uint64_t * overlap_offset, *overlap_size; - char * tmp_buf; + uint64_t *overlap_offset, *overlap_size; + char *tmp_buf; FUNC_ENTER(NULL); #ifdef PDC_TIMING @@ -4868,10 +4869,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef ENABLE_ZFP // Uncompress the data - zfp_field * field; + zfp_field *field; zfp_stream *zfp; size_t bufsize, decompress_size; - bitstream * stream; + bitstream *stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -5132,7 +5133,7 @@ PDC_Server_get_local_storage_meta_with_one_name(storage_meta_query_one_name_args { perr_t ret_value = SUCCEED; pdc_metadata_t *meta = NULL; - region_list_t * region_elt = NULL, *region_head = NULL, *res_region_list = NULL; + region_list_t *region_elt = NULL, *region_head = NULL, *res_region_list = NULL; int region_count = 0, i = 0; FUNC_ENTER(NULL); @@ -5264,7 +5265,7 @@ PDC_Server_accumulate_storage_meta_then_read(storage_meta_query_one_name_args_t { perr_t ret_value = SUCCEED; accumulate_storage_meta_t *accu_meta; - region_list_t * req_region = NULL, *region_elt = NULL, *read_list_head = NULL; + region_list_t *req_region = NULL, *region_elt = NULL, *read_list_head = NULL; int i, is_sort_read; size_t j; @@ -5432,16 +5433,16 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac { hg_return_t hg_ret = HG_SUCCESS; perr_t ret_value; - storage_meta_name_query_in_t * args; + storage_meta_name_query_in_t *args; storage_meta_query_one_name_args_t *query_args; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; bulk_rpc_in_t bulk_rpc_in; - void ** buf_ptrs; - hg_size_t * buf_sizes; + void **buf_ptrs; + hg_size_t *buf_sizes; uint32_t server_id; - region_info_transfer_t ** region_infos; - region_list_t * region_elt; + region_info_transfer_t **region_infos; + region_list_t *region_elt; int i, j; FUNC_ENTER(NULL); @@ -5584,9 +5585,9 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) { perr_t ret_value = SUCCEED; int i, j; - region_storage_meta_t * storage_metas = (region_storage_meta_t *)buf_cp; + region_storage_meta_t *storage_metas = (region_storage_meta_t *)buf_cp; pdc_data_server_io_list_t *io_list_elt, *io_list_target; - region_list_t * new_region; + region_list_t *new_region; FUNC_ENTER(NULL); @@ -5698,7 +5699,7 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) { perr_t ret_value = SUCCEED; uint64_t offset, read_bytes; - FILE * fp_read = NULL; + FILE *fp_read = NULL; if (region->is_data_ready == 1) return SUCCEED; @@ -5747,9 +5748,9 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) { perr_t ret_value = SUCCEED; region_list_t *region_elt; - char * prev_path = NULL; + char *prev_path = NULL; uint64_t offset, read_bytes; - FILE * fp_read = NULL; + FILE *fp_read = NULL; int read_count = 0; @@ -5888,8 +5889,8 @@ static perr_t PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_combine_op_t combine_op) { perr_t ret_value = SUCCEED; - region_list_t * req_region = NULL, *region_tmp = NULL; - region_list_t * storage_region_list_head = NULL; + region_list_t *req_region = NULL, *region_tmp = NULL; + region_list_t *storage_region_list_head = NULL; pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; uint64_t obj_id; int iter, count, is_same_region, i, can_skip; @@ -6161,7 +6162,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE * edata = (TYPE *)(_data); \ + TYPE *edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -6306,7 +6307,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE * edata = (TYPE *)(_data); \ + TYPE *edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -6467,11 +6468,11 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast char keyName[128]; char offName[128]; char out_name[256]; - double * keys = NULL; - int64_t * offsets = NULL; + double *keys = NULL; + int64_t *offsets = NULL; uint32_t *bms = NULL; uint64_t nk = 0, no = 0, nb = 0; - FILE * fp; + FILE *fp; FUNC_ENTER(NULL); @@ -6569,7 +6570,7 @@ int queryData(const char *name) { uint64_t nhits, i; - uint64_t * buf; + uint64_t *buf; double val1 = 0.0, val2 = 10.0; FastBitSelectionHandle sel1 = fastbit_selection_osr(name, FastBitCompareGreater, val1); FastBitSelectionHandle sel2 = fastbit_selection_osr(name, FastBitCompareLess, val2); @@ -6604,7 +6605,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i char offName[128]; char out_name[256]; uint64_t nk = 0, no = 0, nb = 0, size; - FILE * fp; + FILE *fp; PDC_gen_fastbit_idx_name(bmsName, "bms", obj_id, timestep, ndim, start, count); PDC_gen_fastbit_idx_name(keyName, "key", obj_id, timestep, ndim, start, count); @@ -6680,9 +6681,9 @@ PDC_query_fastbit_idx(region_list_t *region, pdc_query_constraint_t *constraint, perr_t ret_value = SUCCEED; FastBitDataType ft = 0; uint64_t type_size; - uint32_t * bms = NULL; - double * keys = NULL; - int64_t * offsets = NULL; + uint32_t *bms = NULL; + double *keys = NULL; + int64_t *offsets = NULL; int timestep; double v1, v2; size_t i; @@ -6858,7 +6859,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ pdc_query_combine_op_t combine_op) { perr_t ret_value = SUCCEED; - region_list_t * region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; + region_list_t *region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; pdc_selection_t *sel = query->sel; uint64_t nelem; size_t i, j, unit_size; @@ -6872,7 +6873,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ uint32_t ulo = 0, uhi = 0; int64_t i64lo = 0, i64hi = 0; uint64_t ui64lo = 0, ui64hi = 0; - void * value = NULL, *buf = NULL; + void *value = NULL, *buf = NULL; int n_eval_region = 0, can_skip, region_iter = 0; LOG_INFO("==PDC_SERVER[%d]: start query evaluation!\n", pdc_server_rank_g); @@ -7213,7 +7214,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ n_eval_region++; } // End DL_FOREACH - } // End not use fastbit + } // End not use fastbit if (n_eval_region == 0 && combine_op == PDC_QUERY_AND) { if (sel->nhits > 0) { @@ -7541,7 +7542,7 @@ PDC_Server_send_coords_to_client(query_task_t *task) hg_bulk_t bulk_handle; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; int client_id; FUNC_ENTER(NULL); @@ -7623,7 +7624,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; int server_id; FUNC_ENTER(NULL); @@ -7830,9 +7831,9 @@ hg_return_t PDC_Server_read_coords(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; - query_task_t * task = (query_task_t *)callback_info->arg; + query_task_t *task = (query_task_t *)callback_info->arg; pdc_query_constraint_t *constraint; - region_list_t * storage_region_head, *region_elt, *cache_region; + region_list_t *storage_region_head, *region_elt, *cache_region; size_t ndim, unit_size; uint64_t i, *coord, data_off, buf_off, my_size; @@ -7898,11 +7899,11 @@ PDC_recv_read_coords(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t * task_elt = NULL; + query_task_t *task_elt = NULL; uint64_t nhits, obj_id; uint32_t ndim; int query_id, origin; - void * buf; + void *buf; pdc_int_ret_t out; out.ret = 1; @@ -7981,7 +7982,7 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t * task_elt; + query_task_t *task_elt; uint64_t nhits = 0, total_hits; size_t ndim, unit_size; int i, query_id, origin, found_task; @@ -8395,8 +8396,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in { pdc_metadata_t *meta = NULL; int i, server_id, count, avg_count, nsent, nsent_server; - region_list_t * elt, *new_region = NULL; - void * region_bulk_buf; + region_list_t *elt, *new_region = NULL; + void *region_bulk_buf; uint64_t buf_alloc = 0, buf_off = 0; bulk_rpc_in_t header; @@ -8536,16 +8537,16 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; - void * buf; - region_list_t * regions = NULL; + struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; + void *buf; + region_list_t *regions = NULL; int i, nregion, *loc_len_ptr, *has_hist_ptr, found_task; uint64_t buf_off, *offset_ptr = NULL, *size_ptr = NULL; - char * loc_ptr = NULL; + char *loc_ptr = NULL; region_info_transfer_t *region_info_ptr = NULL; - pdc_histogram_t * hist_ptr = NULL; - query_task_t * task_elt = NULL; - pdc_query_t * query = NULL; + pdc_histogram_t *hist_ptr = NULL; + query_task_t *task_elt = NULL; + pdc_query_t *query = NULL; pdc_int_ret_t out; out.ret = 1; @@ -8714,10 +8715,10 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; pdc_query_xfer_t *query_xfer = (pdc_query_xfer_t *)callback_info->arg; int obj_idx = 0; - uint64_t * obj_ids; - query_task_t * new_task = NULL, *task_elt; + uint64_t *obj_ids; + query_task_t *new_task = NULL, *task_elt; int query_id_exist = 0; - pdc_query_t * query; + pdc_query_t *query; query = PDC_deserialize_query(query_xfer); if (NULL == query) { @@ -8823,7 +8824,7 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void * buf; + void *buf; FUNC_ENTER(NULL); @@ -8934,12 +8935,12 @@ hg_return_t PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; - get_sel_data_rpc_in_t * in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t * task_elt, *task = NULL; + get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; + query_task_t *task_elt, *task = NULL; uint64_t nhits, *coord, *coords = NULL, obj_id, buf_off, my_size, data_off, i; size_t ndim, unit_size; cache_storage_region_t *cache_region_elt; - region_list_t * storage_region_head = NULL, *cache_region, *region_elt; + region_list_t *storage_region_head = NULL, *cache_region, *region_elt; pdc_var_type_t data_type; // find task @@ -9027,8 +9028,8 @@ PDC_Server_recv_get_sel_data(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t * task_elt, *task = NULL; - pdc_metadata_t * meta; + query_task_t *task_elt, *task = NULL; + pdc_metadata_t *meta; struct hg_cb_info fake_callback_info = {0}; DL_FOREACH(query_task_list_head_g, task_elt) From 24ae499879a1cc44bb02b6cabab3d7b5ac5b0285 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 17 May 2025 21:58:18 +0000 Subject: [PATCH 40/43] Committing clang-format changes --- .../dart/index/idioms/idioms_persistence.c | 20 +- src/server/pdc_server.c | 60 ++--- .../pdc_server_region/pdc_server_data.c | 246 +++++++++--------- 3 files changed, 163 insertions(+), 163 deletions(-) diff --git a/src/commons/index/dart/index/idioms/idioms_persistence.c b/src/commons/index/dart/index/idioms/idioms_persistence.c index ac246e23a..2d9b465fe 100644 --- a/src/commons/index/dart/index/idioms/idioms_persistence.c +++ b/src/commons/index/dart/index/idioms/idioms_persistence.c @@ -35,7 +35,7 @@ append_obj_id_set(Set *obj_id_set, BULKI_Entity *id_set_entity) SetIterator iter; set_iterate(obj_id_set, &iter); while (set_iter_has_more(&iter)) { - uint64_t *item = (uint64_t *)set_iter_next(&iter); + uint64_t * item = (uint64_t *)set_iter_next(&iter); BULKI_Entity *id_entity = BULKI_ENTITY(item, 1, PDC_UINT64, PDC_CLS_ITEM); BULKI_ENTITY_append_BULKI_Entity(id_set_entity, id_entity); } @@ -121,7 +121,7 @@ append_attr_name_node(void *data, const unsigned char *key, uint32_t key_len, vo int rst = 0; key_index_leaf_content_t *leafcnt = (key_index_leaf_content_t *)value; - HashTable *vnode_buf_ht = (HashTable *)data; // data is the parameter passed in + HashTable * vnode_buf_ht = (HashTable *)data; // data is the parameter passed in // the hash table is used to store the buffer struct related to each vnode id. BULKI *kv_bulki = hash_table_lookup(vnode_buf_ht, &(leafcnt->virtural_node_id)); // index_buffer_t *buffer = hash_table_lookup(vnode_buf_ht, &(leafcnt->virtural_node_id)); @@ -192,7 +192,7 @@ dump_attr_root_tree(art_tree *art, char *dir_path, char *base_name, uint32_t ser HashTablePair pair = hash_table_iter_next(&iter); // vnode ID. On different server, there can be the same vnode ID at this line below uint64_t *vid = pair.key; - BULKI *bulki = pair.value; + BULKI * bulki = pair.value; char file_name[1024]; // and this is why do we need to differentiate the file name by the server ID. sprintf(file_name, "%s/%s_%" PRIu32 "_%" PRIu64 ".bin", dir_path, base_name, serverID, *vid); @@ -212,7 +212,7 @@ dump_dart_info(DART *dart, char *dir_path, uint32_t serverID) sprintf(file_name, "%s/%s.bin", dir_path, "dart_info"); LOG_INFO("Writing DART info to file_name: %s\n", file_name); int fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644); - FILE *stream = fdopen(fd, "wb"); + FILE * stream = fdopen(fd, "wb"); BULKI_Entity *dart_ent = empty_Bent_Array_Entity(); BULKI_ENTITY_append_BULKI_Entity(dart_ent, BULKI_ENTITY(&(dart->alphabet_size), 1, PDC_INT, PDC_CLS_ITEM)); @@ -260,7 +260,7 @@ fill_set_from_BULKI_Entity(value_index_leaf_content_t *value_index_leaf, BULKI_E BULKI_Entity_Iterator *it = Bent_iterator_init(data_entity, NULL, PDC_UNKNOWN); while (Bent_iterator_has_next_Bent(it)) { BULKI_Entity *id_entity = Bent_iterator_next_Bent(it); - uint64_t *obj_id = calloc(1, sizeof(uint64_t)); + uint64_t * obj_id = calloc(1, sizeof(uint64_t)); memcpy(obj_id, id_entity->data, sizeof(uint64_t)); set_insert(value_index_leaf->obj_id_set, obj_id); value_index_leaf->indexed_item_count++; @@ -277,8 +277,8 @@ read_attr_value_node(key_index_leaf_content_t *leaf_cnt, int value_tree_idx, BUL BULKI_KV_Pair_Iterator *it = BULKI_KV_Pair_iterator_init(v_id_bulki); while (BULKI_KV_Pair_iterator_has_next(it)) { BULKI_KV_Pair *kv_pair = BULKI_KV_Pair_iterator_next(it); - BULKI_Entity *key_entity = &(kv_pair->key); - BULKI_Entity *data_entity = &(kv_pair->value); + BULKI_Entity * key_entity = &(kv_pair->key); + BULKI_Entity * data_entity = &(kv_pair->value); value_index_leaf_content_t *value_index_leaf = (value_index_leaf_content_t *)calloc(1, sizeof(value_index_leaf_content_t)); @@ -383,8 +383,8 @@ read_attr_name_node(IDIOMS_t *idioms, char *dir_path, char *base_name, uint32_t BULKI_KV_Pair_Iterator *it = BULKI_KV_Pair_iterator_init(bulki); while (BULKI_KV_Pair_iterator_has_next(it)) { BULKI_KV_Pair *kv_pair = BULKI_KV_Pair_iterator_next(it); - BULKI_Entity *key_entity = &(kv_pair->key); - BULKI_Entity *data_entity = &(kv_pair->value); + BULKI_Entity * key_entity = &(kv_pair->key); + BULKI_Entity * data_entity = &(kv_pair->value); key_index_leaf_content_t *leafcnt = (key_index_leaf_content_t *)calloc(1, sizeof(key_index_leaf_content_t)); @@ -433,7 +433,7 @@ load_dart_info(DART *dart, char *dir_path, uint32_t serverID) if (stream == NULL) { return; } - BULKI_Entity *dart_ent = BULKI_Entity_deserialize_from_file(stream); + BULKI_Entity * dart_ent = BULKI_Entity_deserialize_from_file(stream); BULKI_Entity_Iterator *it = Bent_iterator_init(dart_ent, NULL, PDC_UNKNOWN); int i = 0; while (Bent_iterator_has_next_Bent(it)) { diff --git a/src/server/pdc_server.c b/src/server/pdc_server.c index 292d139ca..dfdcecbcd 100644 --- a/src/server/pdc_server.c +++ b/src/server/pdc_server.c @@ -82,7 +82,7 @@ sqlite3 *sqlite3_db_g; int is_debug_g = 0; int pdc_client_num_g = 0; -hg_class_t *hg_class_g = NULL; +hg_class_t * hg_class_g = NULL; hg_context_t *hg_context_g = NULL; // Below three are guarded by pdc_server_task_mutex_g for multi-thread @@ -90,10 +90,10 @@ pdc_task_list_t *pdc_server_agg_task_head_g = NULL; pdc_task_list_t *pdc_server_s2s_task_head_g = NULL; int pdc_server_task_id_g = PDC_SERVER_TASK_INIT_VALUE; -pdc_client_info_t *pdc_client_info_g = NULL; +pdc_client_info_t * pdc_client_info_g = NULL; pdc_remote_server_info_t *pdc_remote_server_info_g = NULL; -char *all_addr_strings_1d_g = NULL; -char **all_addr_strings_g = NULL; +char * all_addr_strings_1d_g = NULL; +char ** all_addr_strings_g = NULL; int is_hash_table_init_g = 0; int lustre_stripe_size_mb_g = 16; int lustre_total_ost_g = 0; @@ -146,7 +146,7 @@ int gen_fastbit_idx_g = 0; int use_fastbit_idx_g = 0; int use_rocksdb_g = 0; int use_sqlite3_g = 0; -char *gBinningOption = NULL; +char * gBinningOption = NULL; double server_write_time_g = 0.0; double server_read_time_g = 0.0; @@ -164,9 +164,9 @@ volatile int dbg_sleep_g = 1; double total_mem_usage_g = 0.0; // Data server related -pdc_data_server_io_list_t *pdc_data_server_read_list_head_g = NULL; -pdc_data_server_io_list_t *pdc_data_server_write_list_head_g = NULL; -update_storage_meta_list_t *pdc_update_storage_meta_list_head_g = NULL; +pdc_data_server_io_list_t * pdc_data_server_read_list_head_g = NULL; +pdc_data_server_io_list_t * pdc_data_server_write_list_head_g = NULL; +update_storage_meta_list_t * pdc_update_storage_meta_list_head_g = NULL; extern data_server_region_t *dataserver_region_g; /* @@ -379,7 +379,7 @@ static int remove_directory(const char *dir) { int ret = 0; - FTS *ftsp = NULL; + FTS * ftsp = NULL; FTSENT *curr; // Cast needed (in C) because fts_open() takes a "char * const *", instead @@ -543,7 +543,7 @@ PDC_Server_lookup_server_id(int remote_server_id) lookup_args->server_id = remote_server_id; hg_ret = HG_Addr_lookup(hg_context_g, lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { LOG_ERROR("==PDC_SERVER: Connection to remote server FAILED!\n"); ret_value = FAIL; @@ -663,7 +663,7 @@ PDC_Server_lookup_client(uint32_t client_id) // Lookup and fill the client info server_lookup_args_t lookup_args; - char *target_addr_string; + char * target_addr_string; lookup_args.server_id = pdc_server_rank_g; lookup_args.client_id = client_id; @@ -799,7 +799,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context) uint32_t credential = 0, cookie; drc_info_handle_t credential_info; char pdc_auth_key[256] = {'\0'}; - char *auth_key; + char * auth_key; int rc; #endif @@ -1051,7 +1051,7 @@ perr_t PDC_Server_finalize() { pdc_data_server_io_list_t *io_elt = NULL; - region_list_t *region_elt = NULL, *region_tmp = NULL; + region_list_t * region_elt = NULL, *region_tmp = NULL; perr_t ret_value = SUCCEED; hg_return_t hg_ret; @@ -1217,21 +1217,21 @@ perr_t PDC_Server_checkpoint() { perr_t ret_value = SUCCEED; - pdc_metadata_t *elt; - region_list_t *region_elt; - pdc_kvtag_list_t *kvlist_elt; - pdc_hash_table_entry_head *head; + pdc_metadata_t * elt; + region_list_t * region_elt; + pdc_kvtag_list_t * kvlist_elt; + pdc_hash_table_entry_head * head; pdc_cont_hash_table_entry_t *cont_head; int n_entry, metadata_size = 0, region_count = 0, n_region, n_objs, n_write_region = 0, n_kvtag, key_len; uint32_t hash_key; HashTablePair pair; char checkpoint_file[ADDR_MAX], checkpoint_file_local[ADDR_MAX], cmd[4096]; HashTableIterator hash_table_iter; - char *checkpoint; - char *env_char; + char * checkpoint; + char * env_char; uint64_t checkpoint_size; bool use_tmpfs = false; - FILE *file; + FILE * file; FUNC_ENTER(NULL); @@ -1354,7 +1354,7 @@ PDC_Server_checkpoint() metadata_size++; region_count += n_region; } // End for metadata entry linked list - } // End for hash table metadata entry + } // End for hash table metadata entry // Note data server region are managed by data server instead of metadata server data_server_region_t *region = NULL; @@ -1448,14 +1448,14 @@ PDC_Server_restart(char *filename) int n_entry, count, i, j, nobj = 0, all_nobj = 0, all_n_region, n_region, n_objs, total_region = 0, n_kvtag, key_len; int n_cont, all_cont; - pdc_metadata_t *metadata, *elt; - region_list_t *region_list; - pdc_hash_table_entry_head *entry; + pdc_metadata_t * metadata, *elt; + region_list_t * region_list; + pdc_hash_table_entry_head * entry; pdc_cont_hash_table_entry_t *cont_entry; - uint32_t *hash_key; + uint32_t * hash_key; unsigned idx; uint64_t checkpoint_size; - char *checkpoint_buf; + char * checkpoint_buf; #ifdef PDC_TIMING double start = MPI_Wtime(); #endif @@ -1736,8 +1736,8 @@ PDC_Server_restart(char *filename) MPI_Reduce(&nobj, &all_nobj, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); MPI_Reduce(&total_region, &all_n_region, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); #else - all_nobj = nobj; - all_n_region = total_region; + all_nobj = nobj; + all_n_region = total_region; #endif if (pdc_server_rank_g == 0) { @@ -1765,7 +1765,7 @@ PDC_Server_restart(char *filename) static HG_THREAD_RETURN_TYPE hg_progress_thread(void *arg) { - hg_context_t *context = (hg_context_t *)arg; + hg_context_t * context = (hg_context_t *)arg; HG_THREAD_RETURN_TYPE tret = (HG_THREAD_RETURN_TYPE)0; hg_return_t ret = HG_SUCCESS; @@ -2250,7 +2250,7 @@ server_run(int argc, char *argv[]) rocksdb_options_set_create_if_missing(options, 1); rocksdb_block_based_table_options_t *table_options = rocksdb_block_based_options_create(); - rocksdb_filterpolicy_t *filter_policy = rocksdb_filterpolicy_create_bloom(10); + rocksdb_filterpolicy_t * filter_policy = rocksdb_filterpolicy_create_bloom(10); rocksdb_block_based_options_set_filter_policy(table_options, filter_policy); rocksdb_options_set_block_based_table_factory(options, table_options); diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index af173fb7a..71d1629f5 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -62,7 +62,7 @@ #include "pdc_logger.h" // Global object region info list in local data server -data_server_region_t *dataserver_region_g = NULL; +data_server_region_t * dataserver_region_g = NULL; data_server_region_unmap_t *dataserver_region_unmap = NULL; int pdc_buffered_bulk_update_total_g = 0; @@ -79,10 +79,10 @@ uint64_t max_mem_cache_size_mb_g = 0; int cache_percentage_g = 0; int current_read_from_cache_cnt_g = 0; int total_read_from_cache_cnt_g = 0; -FILE *pdc_cache_file_ptr_g = NULL; +FILE * pdc_cache_file_ptr_g = NULL; char pdc_cache_file_path_g[ADDR_MAX]; -query_task_t *query_task_list_head_g = NULL; +query_task_t * query_task_list_head_g = NULL; cache_storage_region_t *cache_storage_region_head_g = NULL; static int @@ -263,7 +263,7 @@ PDC_Server_local_region_lock_status(PDC_mapping_info_t *mapped_region, int *lock { perr_t ret_value = SUCCEED; pdc_metadata_t *res_meta; - region_list_t *elt, *request_region; + region_list_t * elt, *request_region; FUNC_ENTER(NULL); @@ -364,7 +364,7 @@ PDC_Server_clear_obj_region() { perr_t ret_value = SUCCEED; data_server_region_t *elt, *tmp; - region_list_t *elt2, *tmp2; + region_list_t * elt2, *tmp2; FUNC_ENTER(NULL); if (dataserver_region_g != NULL) { @@ -473,10 +473,10 @@ PDC_Data_Server_region_lock(region_lock_in_t *in, region_lock_out_t *out, hg_han { perr_t ret_value = SUCCEED; int ndim; - region_list_t *request_region; + region_list_t * request_region; data_server_region_t *new_obj_reg; - region_list_t *elt1, *tmp; - region_buf_map_t *eltt; + region_list_t * elt1, *tmp; + region_buf_map_t * eltt; int error = 0; int found_lock = 0; // time_t t; @@ -577,8 +577,8 @@ perr_t PDC_Server_release_lock_request(uint64_t obj_id, struct pdc_region_info *region) { perr_t ret_value = SUCCEED; - region_list_t *request_region; - region_list_t *elt, *tmp; + region_list_t * request_region; + region_list_t * elt, *tmp; data_server_region_t *new_obj_reg; region_lock_out_t out; @@ -620,7 +620,7 @@ PDC_Data_Server_region_release(region_lock_in_t *in, region_lock_out_t *out) { perr_t ret_value = SUCCEED; int ndim; - region_list_t *tmp1, *tmp2; + region_list_t * tmp1, *tmp2; region_list_t request_region; int found = 0; data_server_region_t *obj_reg = NULL; @@ -759,7 +759,7 @@ PDC_Data_Server_buf_unmap(const struct hg_info *info, buf_unmap_in_t *in) { perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; - region_buf_map_t *tmp, *elt; + region_buf_map_t * tmp, *elt; data_server_region_t *target_obj; FUNC_ENTER(NULL); @@ -853,9 +853,9 @@ PDC_Data_Server_check_unmap() perr_t ret_value = SUCCEED; int ret = HG_UTIL_SUCCESS; pdcid_t remote_obj_id; - region_buf_map_t *tmp, *elt; + region_buf_map_t * tmp, *elt; data_server_region_unmap_t *tmp1, *elt1; - data_server_region_t *target_obj; + data_server_region_t * target_obj; int completed = 0; FUNC_ENTER(NULL); @@ -954,7 +954,7 @@ buf_unmap_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_unmap_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_unmap_handle; hg_handle_t handle; - struct transfer_buf_unmap *tranx_args; + struct transfer_buf_unmap * tranx_args; int error = 0; FUNC_ENTER(NULL); @@ -1018,7 +1018,7 @@ PDC_Server_buf_unmap_lookup_server_id(int remote_server_id, struct transfer_buf_ lookup_args->server_id = remote_server_id; lookup_args->buf_unmap_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_unmap_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR( @@ -1078,9 +1078,9 @@ PDC_Meta_Server_buf_unmap(buf_unmap_in_t *in, hg_handle_t *handle) hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_unmap_handle; struct transfer_buf_unmap_args *buf_unmap_args; - struct transfer_buf_unmap *addr_args; - pdc_metadata_t *target_meta = NULL; - region_buf_map_t *tmp, *elt; + struct transfer_buf_unmap * addr_args; + pdc_metadata_t * target_meta = NULL; + region_buf_map_t * tmp, *elt; int error = 0; FUNC_ENTER(NULL); @@ -1154,14 +1154,14 @@ region_buf_map_t * PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_list_t *request_region, void *data_ptr) { - region_buf_map_t *ret_value = NULL; + region_buf_map_t * ret_value = NULL; data_server_region_t *new_obj_reg = NULL; - region_list_t *elt_reg; - region_buf_map_t *buf_map_ptr = NULL; - region_buf_map_t *tmp; + region_list_t * elt_reg; + region_buf_map_t * buf_map_ptr = NULL; + region_buf_map_t * tmp; int dup = 0; - char *data_path = NULL; - char *user_specified_data_path = NULL; + char * data_path = NULL; + char * user_specified_data_path = NULL; char storage_location[ADDR_MAX]; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; @@ -1277,9 +1277,9 @@ PDC_Data_Server_buf_map(const struct hg_info *info, buf_map_in_t *in, region_lis void * PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region, size_t type_size) { - void *ret_value = NULL; + void * ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t *tmp; + region_buf_map_t * tmp; FUNC_ENTER(NULL); @@ -1331,9 +1331,9 @@ PDC_Server_maybe_allocate_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t void * PDC_Server_get_region_buf_ptr(pdcid_t obj_id, region_info_transfer_t region) { - void *ret_value = NULL; + void * ret_value = NULL; data_server_region_t *target_obj = NULL, *elt = NULL; - region_buf_map_t *tmp; + region_buf_map_t * tmp; FUNC_ENTER(NULL); @@ -1399,7 +1399,7 @@ buf_map_lookup_remote_server_cb(const struct hg_cb_info *callback_info) struct buf_map_server_lookup_args_t *lookup_args; hg_handle_t server_send_buf_map_handle; hg_handle_t handle; - struct transfer_buf_map *tranx_args; + struct transfer_buf_map * tranx_args; int error = 0; FUNC_ENTER(NULL); @@ -1463,7 +1463,7 @@ PDC_Server_buf_map_lookup_server_id(int remote_server_id, struct transfer_buf_ma lookup_args->server_id = remote_server_id; lookup_args->buf_map_args = transfer_args; hg_ret = HG_Addr_lookup(hg_context_g, buf_map_lookup_remote_server_cb, lookup_args, - pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); + pdc_remote_server_info_g[remote_server_id].addr_string, HG_OP_ID_IGNORE); if (hg_ret != HG_SUCCESS) { error = 1; PGOTO_ERROR( @@ -1519,9 +1519,9 @@ PDC_Meta_Server_buf_map(buf_map_in_t *in, region_buf_map_t *new_buf_map_ptr, hg_ hg_return_t hg_ret = HG_SUCCESS; hg_handle_t server_send_buf_map_handle; struct transfer_buf_map_args *tranx_args = NULL; - struct transfer_buf_map *addr_args; - pdc_metadata_t *target_meta = NULL; - region_buf_map_t *buf_map_ptr; + struct transfer_buf_map * addr_args; + pdc_metadata_t * target_meta = NULL; + region_buf_map_t * buf_map_ptr; int error = 0; FUNC_ENTER(NULL); @@ -1794,11 +1794,11 @@ PDC_Server_notify_client_multi_io_complete(uint32_t client_id, int client_seq_id hg_return_t hg_ret = HG_SUCCESS; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; - void **buf_ptrs; - hg_size_t *buf_sizes; + void ** buf_ptrs; + hg_size_t * buf_sizes; bulk_rpc_in_t bulk_rpc_in; int i; - region_list_t *region_elt; + region_list_t * region_elt; notify_multi_io_args_t *bulk_args; FUNC_ENTER(NULL); @@ -2008,7 +2008,7 @@ PDC_Server_read_check(data_server_read_check_in_t *in, server_read_check_out_t * { perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t *region_elt = NULL; + region_list_t * region_elt = NULL; region_list_t r_target; /* uint32_t i; */ @@ -2094,7 +2094,7 @@ PDC_Server_write_check(data_server_write_check_in_t *in, data_server_write_check { perr_t ret_value = FAIL; pdc_data_server_io_list_t *io_elt = NULL, *io_target = NULL; - region_list_t *region_elt = NULL, *region_tmp = NULL; + region_list_t * region_elt = NULL, *region_tmp = NULL; int found_region = 0; FUNC_ENTER(NULL); @@ -2202,7 +2202,7 @@ PDC_Server_get_local_storage_location_of_region(uint64_t obj_id, region_list_t * { perr_t ret_value = SUCCEED; pdc_metadata_t *target_meta = NULL; - region_list_t *region_elt = NULL; + region_list_t * region_elt = NULL; FUNC_ENTER(NULL); @@ -2329,7 +2329,7 @@ PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_cb_info *cal } } // end of if - } // end of if (write_ret->ret == 1) + } // end of if (write_ret->ret == 1) done: @@ -2361,17 +2361,17 @@ PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) perr_t ret_value = SUCCEED; uint32_t server_id = 0; uint32_t i, j; - pdc_metadata_t *region_meta = NULL, *region_meta_prev = NULL; - region_list_t *region_elt, req_region, **overlap_regions_2d = NULL; + pdc_metadata_t * region_meta = NULL, *region_meta_prev = NULL; + region_list_t * region_elt, req_region, **overlap_regions_2d = NULL; region_info_transfer_t local_region_transfer[PDC_SERVER_MAX_PROC_PER_NODE]; - region_info_transfer_t *all_requests = NULL; + region_info_transfer_t * all_requests = NULL; update_region_storage_meta_bulk_t *send_buf = NULL; update_region_storage_meta_bulk_t *result_storage_meta = NULL; uint32_t total_request_cnt; int data_size = sizeof(region_info_transfer_t); - int *send_bytes = NULL; - int *displs = NULL; - int *request_overlap_cnt = NULL; + int * send_bytes = NULL; + int * displs = NULL; + int * request_overlap_cnt = NULL; int nrequest_per_server = 0; FUNC_ENTER(NULL); @@ -2699,7 +2699,7 @@ PDC_Server_data_io_via_shm(const struct hg_cb_info *callback_info) perr_t ret_value = SUCCEED; pdc_data_server_io_list_t *io_list_elt, *io_list = NULL, *io_list_target = NULL; - region_list_t *region_elt = NULL, *region_tmp; + region_list_t * region_elt = NULL, *region_tmp; int real_bb_cnt = 0, real_lustre_cnt = 0; int write_to_bb_cnt = 0; int count; @@ -3101,7 +3101,7 @@ PDC_Server_update_region_storagelocation_offset(region_list_t *region, int type) hg_return_t hg_ret; perr_t ret_value = SUCCEED; uint32_t server_id = 0; - pdc_metadata_t *region_meta = NULL; + pdc_metadata_t * region_meta = NULL; hg_handle_t update_region_loc_handle; update_region_loc_in_t in; server_lookup_args_t lookup_args; @@ -3203,7 +3203,7 @@ PDC_Server_add_region_storage_meta_to_bulk_buf(region_list_t *region, bulk_xfer_ int i; uint64_t obj_id = 0; update_region_storage_meta_bulk_t *curr_buf_ptr; - uint64_t *obj_id_ptr; + uint64_t * obj_id_ptr; FUNC_ENTER(NULL); @@ -3293,8 +3293,8 @@ PDC_Server_update_region_storage_meta_bulk_local(update_region_storage_meta_bulk { perr_t ret_value = SUCCEED; int i; - pdc_metadata_t *target_meta = NULL; - region_list_t *region_elt = NULL, *new_region = NULL; + pdc_metadata_t * target_meta = NULL; + region_list_t * region_elt = NULL, *new_region = NULL; update_region_storage_meta_bulk_t *bulk_ptr; int update_success = 0, express_insert = 0; uint64_t obj_id; @@ -3417,7 +3417,7 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) int i; uint32_t server_id = 0; update_region_storage_meta_bulk_t *recv_buf = NULL; - void **all_meta = NULL; + void ** all_meta = NULL; #endif FUNC_ENTER(NULL); @@ -3470,9 +3470,9 @@ PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) } perr_t -PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t *bulk_data, perr_t (*cb)(), +PDC_Server_update_region_storage_meta_bulk_with_cb(bulk_xfer_data_t * bulk_data, perr_t (*cb)(), update_storage_meta_list_t *meta_list_target, - int *n_updated) + int * n_updated) { hg_return_t hg_ret; perr_t ret_value = SUCCEED; @@ -3713,7 +3713,7 @@ PDC_Server_read_overlap_regions(uint32_t ndim, uint64_t *req_start, uint64_t *re } *total_read_bytes += read_bytes; } // for each row - } // ndim=2 + } // ndim=2 else if (ndim == 3) { uint64_t buf_serialize_offset; /* fseek (fp, storage_offset, SEEK_SET); */ @@ -3796,8 +3796,8 @@ PDC_Server_read_one_region(region_list_t *read_region) size_t total_read_bytes = 0; uint32_t n_storage_regions = 0; region_list_t *region_elt; - FILE *fp_read = NULL; - char *prev_path = NULL; + FILE * fp_read = NULL; + char * prev_path = NULL; int is_shm_created = 0, is_read_succeed = 0; #ifdef ENABLE_TIMING double fopen_time; @@ -3940,8 +3940,8 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) uint64_t offset = 0; uint32_t i = 0; region_list_t *region_elt = NULL, *previous_region = NULL; - FILE *fp_read = NULL, *fp_write = NULL; - char *prev_path = NULL; + FILE * fp_read = NULL, *fp_write = NULL; + char * prev_path = NULL; #ifdef ENABLE_LUSTRE int stripe_count, stripe_size; #endif @@ -4402,11 +4402,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, { perr_t ret_value = SUCCEED; data_server_region_t *region = NULL; - region_list_t *overlap_region = NULL; + region_list_t * overlap_region = NULL; int is_contained = 0; uint64_t i, j, pos; - uint64_t *overlap_offset, *overlap_size; - char *tmp_buf; + uint64_t * overlap_offset, *overlap_size; + char * tmp_buf; #if 0 size_t total_write_size = 0, local_write_size; int is_overlap; @@ -4690,11 +4690,11 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info, if (is_contained == 0) { request_region->offset = lseek(region->fd, 0, SEEK_END); #ifdef ENABLE_ZFP - zfp_field *field; + zfp_field * field; zfp_stream *zfp; size_t bufsize; - void *buffer; - bitstream *stream; + void * buffer; + bitstream * stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -4768,10 +4768,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, perr_t ret_value = SUCCEED; ssize_t request_bytes = unit; data_server_region_t *region = NULL; - region_list_t *elt; + region_list_t * elt; uint64_t i, j, pos; - uint64_t *overlap_offset, *overlap_size; - char *tmp_buf; + uint64_t * overlap_offset, *overlap_size; + char * tmp_buf; FUNC_ENTER(NULL); #ifdef PDC_TIMING @@ -4869,10 +4869,10 @@ PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, #ifdef ENABLE_ZFP // Uncompress the data - zfp_field *field; + zfp_field * field; zfp_stream *zfp; size_t bufsize, decompress_size; - bitstream *stream; + bitstream * stream; field = _setup_zfp(region_info, &zfp); if (field == NULL) @@ -5133,7 +5133,7 @@ PDC_Server_get_local_storage_meta_with_one_name(storage_meta_query_one_name_args { perr_t ret_value = SUCCEED; pdc_metadata_t *meta = NULL; - region_list_t *region_elt = NULL, *region_head = NULL, *res_region_list = NULL; + region_list_t * region_elt = NULL, *region_head = NULL, *res_region_list = NULL; int region_count = 0, i = 0; FUNC_ENTER(NULL); @@ -5265,7 +5265,7 @@ PDC_Server_accumulate_storage_meta_then_read(storage_meta_query_one_name_args_t { perr_t ret_value = SUCCEED; accumulate_storage_meta_t *accu_meta; - region_list_t *req_region = NULL, *region_elt = NULL, *read_list_head = NULL; + region_list_t * req_region = NULL, *region_elt = NULL, *read_list_head = NULL; int i, is_sort_read; size_t j; @@ -5433,16 +5433,16 @@ PDC_Server_storage_meta_name_query_bulk_respond(const struct hg_cb_info *callbac { hg_return_t hg_ret = HG_SUCCESS; perr_t ret_value; - storage_meta_name_query_in_t *args; + storage_meta_name_query_in_t * args; storage_meta_query_one_name_args_t *query_args; hg_handle_t rpc_handle; hg_bulk_t bulk_handle; bulk_rpc_in_t bulk_rpc_in; - void **buf_ptrs; - hg_size_t *buf_sizes; + void ** buf_ptrs; + hg_size_t * buf_sizes; uint32_t server_id; - region_info_transfer_t **region_infos; - region_list_t *region_elt; + region_info_transfer_t ** region_infos; + region_list_t * region_elt; int i, j; FUNC_ENTER(NULL); @@ -5585,9 +5585,9 @@ PDC_Server_add_client_shm_to_cache(int cnt, void *buf_cp) { perr_t ret_value = SUCCEED; int i, j; - region_storage_meta_t *storage_metas = (region_storage_meta_t *)buf_cp; + region_storage_meta_t * storage_metas = (region_storage_meta_t *)buf_cp; pdc_data_server_io_list_t *io_list_elt, *io_list_target; - region_list_t *new_region; + region_list_t * new_region; FUNC_ENTER(NULL); @@ -5699,7 +5699,7 @@ PDC_Server_data_read_to_buf_1_region(region_list_t *region) { perr_t ret_value = SUCCEED; uint64_t offset, read_bytes; - FILE *fp_read = NULL; + FILE * fp_read = NULL; if (region->is_data_ready == 1) return SUCCEED; @@ -5748,9 +5748,9 @@ PDC_Server_data_read_to_buf(region_list_t *region_list_head) { perr_t ret_value = SUCCEED; region_list_t *region_elt; - char *prev_path = NULL; + char * prev_path = NULL; uint64_t offset, read_bytes; - FILE *fp_read = NULL; + FILE * fp_read = NULL; int read_count = 0; @@ -5889,8 +5889,8 @@ static perr_t PDC_Server_load_query_data(query_task_t *task, pdc_query_t *query, pdc_query_combine_op_t combine_op) { perr_t ret_value = SUCCEED; - region_list_t *req_region = NULL, *region_tmp = NULL; - region_list_t *storage_region_list_head = NULL; + region_list_t * req_region = NULL, *region_tmp = NULL; + region_list_t * storage_region_list_head = NULL; pdc_data_server_io_list_t *io_list_elt, *io_list_target = NULL; uint64_t obj_id; int iter, count, is_same_region, i, can_skip; @@ -6162,7 +6162,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE *edata = (TYPE *)(_data); \ + TYPE * edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -6307,7 +6307,7 @@ compare_coords_3d(const void *a, const void *b) ({ \ uint64_t idx, iii, jjj, ttt, cur_count = 0, istart, has_dup; \ int is_good, _ndim; \ - TYPE *edata = (TYPE *)(_data); \ + TYPE * edata = (TYPE *)(_data); \ _ndim = (_region)->ndim; \ istart = (_sel)->nhits * _ndim; \ if (_ndim > 3) { \ @@ -6468,11 +6468,11 @@ generate_write_fastbit_idx(uint64_t obj_id, void *data, uint64_t dataCount, Fast char keyName[128]; char offName[128]; char out_name[256]; - double *keys = NULL; - int64_t *offsets = NULL; + double * keys = NULL; + int64_t * offsets = NULL; uint32_t *bms = NULL; uint64_t nk = 0, no = 0, nb = 0; - FILE *fp; + FILE * fp; FUNC_ENTER(NULL); @@ -6570,7 +6570,7 @@ int queryData(const char *name) { uint64_t nhits, i; - uint64_t *buf; + uint64_t * buf; double val1 = 0.0, val2 = 10.0; FastBitSelectionHandle sel1 = fastbit_selection_osr(name, FastBitCompareGreater, val1); FastBitSelectionHandle sel2 = fastbit_selection_osr(name, FastBitCompareLess, val2); @@ -6605,7 +6605,7 @@ PDC_load_fastbit_index(char *idx_name, uint64_t obj_id, FastBitDataType dtype, i char offName[128]; char out_name[256]; uint64_t nk = 0, no = 0, nb = 0, size; - FILE *fp; + FILE * fp; PDC_gen_fastbit_idx_name(bmsName, "bms", obj_id, timestep, ndim, start, count); PDC_gen_fastbit_idx_name(keyName, "key", obj_id, timestep, ndim, start, count); @@ -6681,9 +6681,9 @@ PDC_query_fastbit_idx(region_list_t *region, pdc_query_constraint_t *constraint, perr_t ret_value = SUCCEED; FastBitDataType ft = 0; uint64_t type_size; - uint32_t *bms = NULL; - double *keys = NULL; - int64_t *offsets = NULL; + uint32_t * bms = NULL; + double * keys = NULL; + int64_t * offsets = NULL; int timestep; double v1, v2; size_t i; @@ -6859,7 +6859,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ pdc_query_combine_op_t combine_op) { perr_t ret_value = SUCCEED; - region_list_t *region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; + region_list_t * region_elt, *region_list_head, *cache_region, tmp_region, *region_constraint = NULL; pdc_selection_t *sel = query->sel; uint64_t nelem; size_t i, j, unit_size; @@ -6873,7 +6873,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ uint32_t ulo = 0, uhi = 0; int64_t i64lo = 0, i64hi = 0; uint64_t ui64lo = 0, ui64hi = 0; - void *value = NULL, *buf = NULL; + void * value = NULL, *buf = NULL; int n_eval_region = 0, can_skip, region_iter = 0; LOG_INFO("==PDC_SERVER[%d]: start query evaluation!\n", pdc_server_rank_g); @@ -7214,7 +7214,7 @@ PDC_Server_query_evaluate_merge_opt(pdc_query_t *query, query_task_t *task, pdc_ n_eval_region++; } // End DL_FOREACH - } // End not use fastbit + } // End not use fastbit if (n_eval_region == 0 && combine_op == PDC_QUERY_AND) { if (sel->nhits > 0) { @@ -7542,7 +7542,7 @@ PDC_Server_send_coords_to_client(query_task_t *task) hg_bulk_t bulk_handle; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; int client_id; FUNC_ENTER(NULL); @@ -7624,7 +7624,7 @@ PDC_Server_send_coords_to_server(query_task_t *task) hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; int server_id; FUNC_ENTER(NULL); @@ -7831,9 +7831,9 @@ hg_return_t PDC_Server_read_coords(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; - query_task_t *task = (query_task_t *)callback_info->arg; + query_task_t * task = (query_task_t *)callback_info->arg; pdc_query_constraint_t *constraint; - region_list_t *storage_region_head, *region_elt, *cache_region; + region_list_t * storage_region_head, *region_elt, *cache_region; size_t ndim, unit_size; uint64_t i, *coord, data_off, buf_off, my_size; @@ -7899,11 +7899,11 @@ PDC_recv_read_coords(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t *task_elt = NULL; + query_task_t * task_elt = NULL; uint64_t nhits, obj_id; uint32_t ndim; int query_id, origin; - void *buf; + void * buf; pdc_int_ret_t out; out.ret = 1; @@ -7982,7 +7982,7 @@ PDC_recv_coords(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - query_task_t *task_elt; + query_task_t * task_elt; uint64_t nhits = 0, total_hits; size_t ndim, unit_size; int i, query_id, origin, found_task; @@ -8396,8 +8396,8 @@ PDC_Server_distribute_query_storage_info(query_task_t *task, uint64_t obj_id, in { pdc_metadata_t *meta = NULL; int i, server_id, count, avg_count, nsent, nsent_server; - region_list_t *elt, *new_region = NULL; - void *region_bulk_buf; + region_list_t * elt, *new_region = NULL; + void * region_bulk_buf; uint64_t buf_alloc = 0, buf_off = 0; bulk_rpc_in_t header; @@ -8537,16 +8537,16 @@ PDC_recv_query_metadata_bulk(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; hg_bulk_t local_bulk_handle = callback_info->info.bulk.local_handle; - struct bulk_args_t *bulk_args = (struct bulk_args_t *)callback_info->arg; - void *buf; - region_list_t *regions = NULL; + struct bulk_args_t * bulk_args = (struct bulk_args_t *)callback_info->arg; + void * buf; + region_list_t * regions = NULL; int i, nregion, *loc_len_ptr, *has_hist_ptr, found_task; uint64_t buf_off, *offset_ptr = NULL, *size_ptr = NULL; - char *loc_ptr = NULL; + char * loc_ptr = NULL; region_info_transfer_t *region_info_ptr = NULL; - pdc_histogram_t *hist_ptr = NULL; - query_task_t *task_elt = NULL; - pdc_query_t *query = NULL; + pdc_histogram_t * hist_ptr = NULL; + query_task_t * task_elt = NULL; + pdc_query_t * query = NULL; pdc_int_ret_t out; out.ret = 1; @@ -8715,10 +8715,10 @@ PDC_Server_recv_data_query(const struct hg_cb_info *callback_info) hg_return_t ret = HG_SUCCESS; pdc_query_xfer_t *query_xfer = (pdc_query_xfer_t *)callback_info->arg; int obj_idx = 0; - uint64_t *obj_ids; - query_task_t *new_task = NULL, *task_elt; + uint64_t * obj_ids; + query_task_t * new_task = NULL, *task_elt; int query_id_exist = 0; - pdc_query_t *query; + pdc_query_t * query; query = PDC_deserialize_query(query_xfer); if (NULL == query) { @@ -8824,7 +8824,7 @@ PDC_Server_send_read_coords_to_server(int server_id, uint64_t *coord, uint64_t n hg_bulk_t bulk_handle = NULL; bulk_rpc_in_t in; hg_size_t buf_sizes; - void *buf; + void * buf; FUNC_ENTER(NULL); @@ -8935,12 +8935,12 @@ hg_return_t PDC_Server_recv_read_sel_obj_data(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; - get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t *task_elt, *task = NULL; + get_sel_data_rpc_in_t * in = (get_sel_data_rpc_in_t *)callback_info->arg; + query_task_t * task_elt, *task = NULL; uint64_t nhits, *coord, *coords = NULL, obj_id, buf_off, my_size, data_off, i; size_t ndim, unit_size; cache_storage_region_t *cache_region_elt; - region_list_t *storage_region_head = NULL, *cache_region, *region_elt; + region_list_t * storage_region_head = NULL, *cache_region, *region_elt; pdc_var_type_t data_type; // find task @@ -9028,8 +9028,8 @@ PDC_Server_recv_get_sel_data(const struct hg_cb_info *callback_info) { hg_return_t ret = HG_SUCCESS; get_sel_data_rpc_in_t *in = (get_sel_data_rpc_in_t *)callback_info->arg; - query_task_t *task_elt, *task = NULL; - pdc_metadata_t *meta; + query_task_t * task_elt, *task = NULL; + pdc_metadata_t * meta; struct hg_cb_info fake_callback_info = {0}; DL_FOREACH(query_task_list_head_g, task_elt) From 068b6336f09a3094cbf79bcb7dd05f96ef280bad Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 17 May 2025 15:03:51 -0700 Subject: [PATCH 41/43] update --- src/commons/serde/bulki/bulki_serde_test.c | 39 ++++++++++++---------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/commons/serde/bulki/bulki_serde_test.c b/src/commons/serde/bulki/bulki_serde_test.c index 9f1f1076f..94eb0b3a5 100644 --- a/src/commons/serde/bulki/bulki_serde_test.c +++ b/src/commons/serde/bulki/bulki_serde_test.c @@ -1,6 +1,9 @@ #include "bulki_serde.h" #include "pdc_logger.h" +#include +#include + int test_base_type() { @@ -8,7 +11,7 @@ test_base_type() BULKI *bulki = BULKI_init(2); // Create and append key-value pairs for different data types - char * intKey_str = "int"; + char *intKey_str = "int"; int intVal = 42; BULKI_Entity *intKey = BULKI_ENTITY(intKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *intValue = BULKI_ENTITY(&intVal, 1, PDC_INT, PDC_CLS_ITEM); @@ -24,31 +27,33 @@ test_base_type() // freeing issue. BULKI_put(bulki, intArrKey, BULKI_ENTITY(&intVal, 1, PDC_INT, PDC_CLS_ARRAY)); - char * doubleKey_str = "double"; + char *doubleKey_str = "double"; double doubleVal = 3.14159; BULKI_Entity *doubleKey = BULKI_ENTITY(doubleKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *doubleValue = BULKI_ENTITY(&doubleVal, 1, PDC_DOUBLE, PDC_CLS_ITEM); BULKI_put(bulki, doubleKey, doubleValue); - char * strKey_str = "string"; - char * strVal = "Hello, World!"; + char *strKey_str = "string"; + char *strVal = "Hello, World!"; BULKI_Entity *strKey = BULKI_ENTITY(strKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *strValue = BULKI_ENTITY(strVal, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_put(bulki, strKey, strValue); // Serialize the data size_t size; - void * buffer = BULKI_serialize(bulki, &size); + void *buffer = BULKI_serialize(bulki, &size); // Do some I/O if you like - FILE *fp = fopen("test_bulki.bin", "wb"); + int fd = open("test_bulki.bin", O_WRONLY | O_CREAT | O_TRUNC, 0644); + FILE *fp = fdopen(fd, "wb"); fwrite(buffer, 1, size, fp); fclose(fp); BULKI_free(bulki, 1); // read the file and deserialize - fp = fopen("test_bulki.bin", "rb"); + fd = open("test_bulki.bin", O_WRONLY | O_CREAT | O_TRUNC, 0644); + fp = fdopen(fd, "rb"); fseek(fp, 0, SEEK_END); long fsize = ftell(fp); fseek(fp, 0, SEEK_SET); /* same as rewind(f); */ @@ -104,7 +109,7 @@ test_base_array_entitiy() BULKI *bulki = BULKI_init(2); // Create and append key-value pairs for different data types - char * intKey_str = "int"; + char *intKey_str = "int"; int intVal = 42; uint64_t intObjID = 12416574651687; BULKI_Entity *intKey = BULKI_ENTITY(intKey_str, 1, PDC_STRING, PDC_CLS_ITEM); @@ -113,7 +118,7 @@ test_base_array_entitiy() BULKI_ENTITY_append_BULKI_Entity(intArr, BULKI_ENTITY(&intObjID, 1, PDC_UINT64, PDC_CLS_ITEM)); BULKI_put(bulki, intKey, intArr); - char * doubleKey_str = "double"; + char *doubleKey_str = "double"; double doubleVal = 3.14159; uint64_t doubleObjID = 564987951987494; BULKI_Entity *doubleKey = BULKI_ENTITY(doubleKey_str, 1, PDC_STRING, PDC_CLS_ITEM); @@ -131,7 +136,7 @@ test_base_array_entitiy() BULKI_ENTITY_append_BULKI_Entity(strArr, BULKI_ENTITY(&intObjID, 1, PDC_UINT64, PDC_CLS_ITEM)); BULKI_put(bulki, strKey, strArr); - char * mixedKey_str = "mixed"; + char *mixedKey_str = "mixed"; BULKI_Entity *mixedKey = BULKI_ENTITY(mixedKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *mixedArr = empty_Bent_Array_Entity(); BULKI_ENTITY_append_BULKI_Entity(mixedArr, BULKI_ENTITY(&intVal, 1, PDC_INT, PDC_CLS_ITEM)); @@ -144,7 +149,7 @@ test_base_array_entitiy() BULKI *bulki2 = BULKI_init(2); // Create and append key-value pairs for different data types - char * intKey_str2 = "int"; + char *intKey_str2 = "int"; int intVal2 = 42; BULKI_Entity *intKey2 = BULKI_ENTITY(intKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *intArr2 = empty_BULKI_Array_Entity(); @@ -154,7 +159,7 @@ test_base_array_entitiy() // Serialize the data size_t size; - void * buffer = BULKI_serialize(bulki2, &size); + void *buffer = BULKI_serialize(bulki2, &size); // Deserialize the buffer BULKI *deserializedBulki = BULKI_deserialize(buffer); @@ -177,7 +182,7 @@ test_embedded_entitiy() BULKI *bulki = BULKI_init(2); // Create and append key-value pairs for different data types - char * intKey_str = "int"; + char *intKey_str = "int"; int intVal = 42; uint64_t intObjID = 12416574651687; BULKI_Entity *intKey = BULKI_ENTITY(intKey_str, 1, PDC_STRING, PDC_CLS_ITEM); @@ -186,7 +191,7 @@ test_embedded_entitiy() BULKI_ENTITY_append_BULKI_Entity(intArr, BULKI_ENTITY(&intObjID, 1, PDC_UINT64, PDC_CLS_ITEM)); BULKI_put(bulki, intKey, intArr); - char * doubleKey_str = "double"; + char *doubleKey_str = "double"; double doubleVal = 3.14159; uint64_t doubleObjID = 564987951987494; BULKI_Entity *doubleKey = BULKI_ENTITY(doubleKey_str, 1, PDC_STRING, PDC_CLS_ITEM); @@ -206,7 +211,7 @@ test_embedded_entitiy() // Serialize the data size_t size; - void * buffer = BULKI_serialize(bulki, &size); + void *buffer = BULKI_serialize(bulki, &size); // Deserialize the buffer BULKI *deserializedBulki = BULKI_deserialize(buffer); @@ -231,7 +236,7 @@ test_bulki_in_entitiy() // BULKI in BULKI_Entity BULKI_Entity *nestEntity = BULKI_ENTITY(bulki, 1, PDC_BULKI, PDC_CLS_ITEM); size_t size; - void * buffer = BULKI_Entity_serialize(nestEntity, &size); + void *buffer = BULKI_Entity_serialize(nestEntity, &size); BULKI_Entity *des_nestEntity = BULKI_Entity_deserialize(buffer); int equal = BULKI_Entity_equal(nestEntity, des_nestEntity); @@ -301,7 +306,7 @@ bulki_small_json_serialization_test() BULKI_Entity *property_array = empty_BULKI_Array_Entity(); - BULKI * property1 = BULKI_init(2); // 2 fields: name, value + BULKI *property1 = BULKI_init(2); // 2 fields: name, value BULKI_Entity *name = BULKI_singleton_ENTITY("AIRMASS", PDC_STRING); BULKI_Entity *data = BULKI_ENTITY(&(float){1.19428}, 1, PDC_FLOAT, PDC_CLS_ITEM); BULKI_put(property1, name, data); From 7171541f9319953a90906d062feef29c0cd269e0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 17 May 2025 22:04:19 +0000 Subject: [PATCH 42/43] Committing clang-format changes --- src/commons/serde/bulki/bulki_serde_test.c | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/commons/serde/bulki/bulki_serde_test.c b/src/commons/serde/bulki/bulki_serde_test.c index 94eb0b3a5..bbc978c5b 100644 --- a/src/commons/serde/bulki/bulki_serde_test.c +++ b/src/commons/serde/bulki/bulki_serde_test.c @@ -11,7 +11,7 @@ test_base_type() BULKI *bulki = BULKI_init(2); // Create and append key-value pairs for different data types - char *intKey_str = "int"; + char * intKey_str = "int"; int intVal = 42; BULKI_Entity *intKey = BULKI_ENTITY(intKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *intValue = BULKI_ENTITY(&intVal, 1, PDC_INT, PDC_CLS_ITEM); @@ -27,21 +27,21 @@ test_base_type() // freeing issue. BULKI_put(bulki, intArrKey, BULKI_ENTITY(&intVal, 1, PDC_INT, PDC_CLS_ARRAY)); - char *doubleKey_str = "double"; + char * doubleKey_str = "double"; double doubleVal = 3.14159; BULKI_Entity *doubleKey = BULKI_ENTITY(doubleKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *doubleValue = BULKI_ENTITY(&doubleVal, 1, PDC_DOUBLE, PDC_CLS_ITEM); BULKI_put(bulki, doubleKey, doubleValue); - char *strKey_str = "string"; - char *strVal = "Hello, World!"; + char * strKey_str = "string"; + char * strVal = "Hello, World!"; BULKI_Entity *strKey = BULKI_ENTITY(strKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *strValue = BULKI_ENTITY(strVal, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_put(bulki, strKey, strValue); // Serialize the data size_t size; - void *buffer = BULKI_serialize(bulki, &size); + void * buffer = BULKI_serialize(bulki, &size); // Do some I/O if you like int fd = open("test_bulki.bin", O_WRONLY | O_CREAT | O_TRUNC, 0644); @@ -109,7 +109,7 @@ test_base_array_entitiy() BULKI *bulki = BULKI_init(2); // Create and append key-value pairs for different data types - char *intKey_str = "int"; + char * intKey_str = "int"; int intVal = 42; uint64_t intObjID = 12416574651687; BULKI_Entity *intKey = BULKI_ENTITY(intKey_str, 1, PDC_STRING, PDC_CLS_ITEM); @@ -118,7 +118,7 @@ test_base_array_entitiy() BULKI_ENTITY_append_BULKI_Entity(intArr, BULKI_ENTITY(&intObjID, 1, PDC_UINT64, PDC_CLS_ITEM)); BULKI_put(bulki, intKey, intArr); - char *doubleKey_str = "double"; + char * doubleKey_str = "double"; double doubleVal = 3.14159; uint64_t doubleObjID = 564987951987494; BULKI_Entity *doubleKey = BULKI_ENTITY(doubleKey_str, 1, PDC_STRING, PDC_CLS_ITEM); @@ -136,7 +136,7 @@ test_base_array_entitiy() BULKI_ENTITY_append_BULKI_Entity(strArr, BULKI_ENTITY(&intObjID, 1, PDC_UINT64, PDC_CLS_ITEM)); BULKI_put(bulki, strKey, strArr); - char *mixedKey_str = "mixed"; + char * mixedKey_str = "mixed"; BULKI_Entity *mixedKey = BULKI_ENTITY(mixedKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *mixedArr = empty_Bent_Array_Entity(); BULKI_ENTITY_append_BULKI_Entity(mixedArr, BULKI_ENTITY(&intVal, 1, PDC_INT, PDC_CLS_ITEM)); @@ -149,7 +149,7 @@ test_base_array_entitiy() BULKI *bulki2 = BULKI_init(2); // Create and append key-value pairs for different data types - char *intKey_str2 = "int"; + char * intKey_str2 = "int"; int intVal2 = 42; BULKI_Entity *intKey2 = BULKI_ENTITY(intKey_str, 1, PDC_STRING, PDC_CLS_ITEM); BULKI_Entity *intArr2 = empty_BULKI_Array_Entity(); @@ -159,7 +159,7 @@ test_base_array_entitiy() // Serialize the data size_t size; - void *buffer = BULKI_serialize(bulki2, &size); + void * buffer = BULKI_serialize(bulki2, &size); // Deserialize the buffer BULKI *deserializedBulki = BULKI_deserialize(buffer); @@ -182,7 +182,7 @@ test_embedded_entitiy() BULKI *bulki = BULKI_init(2); // Create and append key-value pairs for different data types - char *intKey_str = "int"; + char * intKey_str = "int"; int intVal = 42; uint64_t intObjID = 12416574651687; BULKI_Entity *intKey = BULKI_ENTITY(intKey_str, 1, PDC_STRING, PDC_CLS_ITEM); @@ -191,7 +191,7 @@ test_embedded_entitiy() BULKI_ENTITY_append_BULKI_Entity(intArr, BULKI_ENTITY(&intObjID, 1, PDC_UINT64, PDC_CLS_ITEM)); BULKI_put(bulki, intKey, intArr); - char *doubleKey_str = "double"; + char * doubleKey_str = "double"; double doubleVal = 3.14159; uint64_t doubleObjID = 564987951987494; BULKI_Entity *doubleKey = BULKI_ENTITY(doubleKey_str, 1, PDC_STRING, PDC_CLS_ITEM); @@ -211,7 +211,7 @@ test_embedded_entitiy() // Serialize the data size_t size; - void *buffer = BULKI_serialize(bulki, &size); + void * buffer = BULKI_serialize(bulki, &size); // Deserialize the buffer BULKI *deserializedBulki = BULKI_deserialize(buffer); @@ -236,7 +236,7 @@ test_bulki_in_entitiy() // BULKI in BULKI_Entity BULKI_Entity *nestEntity = BULKI_ENTITY(bulki, 1, PDC_BULKI, PDC_CLS_ITEM); size_t size; - void *buffer = BULKI_Entity_serialize(nestEntity, &size); + void * buffer = BULKI_Entity_serialize(nestEntity, &size); BULKI_Entity *des_nestEntity = BULKI_Entity_deserialize(buffer); int equal = BULKI_Entity_equal(nestEntity, des_nestEntity); @@ -306,7 +306,7 @@ bulki_small_json_serialization_test() BULKI_Entity *property_array = empty_BULKI_Array_Entity(); - BULKI *property1 = BULKI_init(2); // 2 fields: name, value + BULKI * property1 = BULKI_init(2); // 2 fields: name, value BULKI_Entity *name = BULKI_singleton_ENTITY("AIRMASS", PDC_STRING); BULKI_Entity *data = BULKI_ENTITY(&(float){1.19428}, 1, PDC_FLOAT, PDC_CLS_ITEM); BULKI_put(property1, name, data); From 2df916a5e5102383e6621aab0baabc20605f9022 Mon Sep 17 00:00:00 2001 From: TheAssembler1 Date: Sat, 17 May 2025 15:10:11 -0700 Subject: [PATCH 43/43] fix --- src/commons/serde/bulki/bulki_serde_test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/commons/serde/bulki/bulki_serde_test.c b/src/commons/serde/bulki/bulki_serde_test.c index 94eb0b3a5..e051bfcc1 100644 --- a/src/commons/serde/bulki/bulki_serde_test.c +++ b/src/commons/serde/bulki/bulki_serde_test.c @@ -52,7 +52,7 @@ test_base_type() BULKI_free(bulki, 1); // read the file and deserialize - fd = open("test_bulki.bin", O_WRONLY | O_CREAT | O_TRUNC, 0644); + fd = open("test_bulki.bin", O_RDONLY | O_CREAT | O_TRUNC, 0644); fp = fdopen(fd, "rb"); fseek(fp, 0, SEEK_END); long fsize = ftell(fp); @@ -336,7 +336,8 @@ bulki_small_json_serialization_test() BULKI_put(dataset, key5, value5); - FILE *fp = fopen("dataset.bin", "w"); + int fd = open("dataset.bin", O_WRONLY | O_CREAT | O_TRUNC, 0644); + FILE *fp = fdopen(fd, "w"); BULKI_serialize_to_file(dataset, fp); // fclose(fp); // Free the memory