Skip to content

Adapt serialization to revised protocol #12

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2025
Merged

Adapt serialization to revised protocol #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions src/bmi_cfe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1628,6 +1628,9 @@ static int Get_var_type (Bmi *self, const char *name, char * type)
if (strcmp(name, "serialization_create") == 0) {
strncpy(type, "uint64_t", BMI_MAX_TYPE_NAME);
return BMI_SUCCESS;
} else if (strcmp(name, "serialization_size") == 0) {
strncpy(type, "uint64_t", BMI_MAX_TYPE_NAME);
return BMI_SUCCESS;
} else if (strcmp(name, "serialization_state") == 0) {
strncpy(type, "char", BMI_MAX_TYPE_NAME);
return BMI_SUCCESS;
Expand Down Expand Up @@ -1737,7 +1740,7 @@ static int Get_var_units (Bmi *self, const char *name, char * units)
static int Get_var_nbytes (Bmi *self, const char *name, int * nbytes)
{
// serialization
if (strcmp(name, "serialization_create") == 0) {
if (strcmp(name, "serialization_create") == 0 || strcmp(name, "serialization_size") == 0) {
*nbytes = sizeof(uint64_t);
return BMI_SUCCESS;
} else if (strcmp(name, "serialization_state") == 0) {
Expand Down Expand Up @@ -2046,14 +2049,12 @@ static int Get_value_ptr (Bmi *self, const char *name, void **dest)
/***********************************************************/
/******** SERIALIZATION ******************************/
/***********************************************************/
if (strcmp(name, "serialization_create") == 0) {
int result = new_serialized_cfe(self);
if (result == BMI_SUCCESS) {
cfe_state_struct* model = (cfe_state_struct*)self->data;
*dest = &model->serialized_length;
return BMI_SUCCESS;
}
return BMI_FAILURE;
if (strcmp(name, "serialization_size") == 0) {
cfe_state_struct* model = (cfe_state_struct*)self->data;
if (model->serialized == NULL)
return BMI_FAILURE;
*dest = (void*)&model->serialized_length;
return BMI_SUCCESS;
}
if (strcmp(name, "serialization_state") == 0) {
cfe_state_struct* model = (cfe_state_struct*)self->data;
Expand Down Expand Up @@ -2103,14 +2104,6 @@ static int Get_value_at_indices (Bmi *self, const char *name, void *dest, int *i
static int Get_value (Bmi *self, const char *name, void *dest)
{
// special cases for serialization
if (strcmp(name, "serialization_create") == 0) {
void* ptr;
int result = Get_value_ptr(self, name, &ptr); // run this to create a new save state
if (result != BMI_SUCCESS)
return BMI_FAILURE;
memcpy(dest, ptr, sizeof(uint64_t));
return BMI_SUCCESS;
}
if (strcmp(name, "serialization_state") == 0) {
cfe_state_struct* model = (cfe_state_struct*)self->data;
if (model->serialized != NULL) {
Expand Down Expand Up @@ -2161,6 +2154,8 @@ static int Set_value (Bmi *self, const char *name, void *src)
// serialization
if (strcmp(name, "serialization_state") == 0) {
return load_serialized_cfe(self, (char*)src);
} else if (strcmp(name, "serialization_create") == 0) {
return new_serialized_cfe(self);
} else if (strcmp(name, "serialization_free") == 0) {
return free_serialized_cfe(self);
}
Expand Down
Loading