Skip to content

Adapt serialization to revised protocol #4

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
PhilMiller merged 2 commits into from
Oct 10, 2025
Merged

Adapt serialization to revised protocol #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3f7830
Fix typo in log message
PhilMiller Sep 26, 2025
a064751
Adapt serialization to revised protocol
PhilMiller Sep 26, 2025
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
2 changes: 1 addition & 1 deletion src/bmi_serialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const int serialize_topmodel(Bmi* bmi) {
try {
archive << serializer;
} catch (const std::exception& e) {
Log(LogLevel::SEVERE, "Serializing Topmodel encounterd an error: %s", e.what());
Log(LogLevel::SEVERE, "Serializing Topmodel encountered an error: %s", e.what());
return BMI_FAILURE;
}
// copy serialized data into topmodel data
Expand Down
25 changes: 15 additions & 10 deletions src/bmi_topmodel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,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 @@ -773,7 +776,7 @@ static int Get_var_nbytes(Bmi *self, const char *name, int *nbytes) {
}
// special cases for save state
if (item_count < 1) {
if (strcmp(name, "serialization_create") == 0 || strcmp(name, "serialization_free") == 0) {
if (strcmp(name, "serialization_create") == 0 || strcmp(name, "serialization_size") == 0 || strcmp(name, "serialization_free") == 0) {
item_count = 1;
} else if (strcmp(name, "serialization_state") == 0) {
topmodel_model* model = (topmodel_model*)self->data;
Expand Down Expand Up @@ -975,14 +978,14 @@ static int Get_value_ptr(Bmi *self, const char *name, void **dest) {
}

// serialization commands
if (strcmp(name, "serialization_create") == 0) {
// create new serialized data
if (serialize_topmodel(self) != BMI_SUCCESS)
return BMI_FAILURE;
if (strcmp(name, "serialization_size") == 0) {
topmodel_model* topmodel = (topmodel_model*)self->data;
*dest = &topmodel->serialized_length;
if (topmodel->serialized == NULL)
return BMI_FAILURE;
*dest = (void*)&topmodel->serialized_length;
return BMI_SUCCESS;
} else if (strcmp(name, "serialization_state") == 0) {
}
if (strcmp(name, "serialization_state") == 0) {
topmodel_model* topmodel = (topmodel_model*)self->data;
if (topmodel->serialized == NULL)
return BMI_FAILURE;
Expand Down Expand Up @@ -1043,6 +1046,11 @@ static int Set_value(Bmi *self, const char *name, void *array) {
model->serialized = NULL;
model->serialized_length = 0;
return BMI_SUCCESS;
} else if (strcmp(name, "serialization_create") == 0) {
// create new serialized data
if (serialize_topmodel(self) != BMI_SUCCESS)
return BMI_FAILURE;
return BMI_SUCCESS;
} else if (strcmp(name, "serialization_state") == 0) {
if (deserialize_topmodel(self, (char*)array) == BMI_SUCCESS) {
topmodel_model* model = (topmodel_model*)self->data;
Expand All @@ -1055,9 +1063,6 @@ static int Set_value(Bmi *self, const char *name, void *array) {
} else {
return BMI_FAILURE;
}
} else if (strcmp(name, "serialization_create") == 0) {
Log(WARNING, "Cannot set a value with \"serialization_create\".");
return BMI_FAILURE;
}

if (self->get_value_ptr(self, name, &dest) == BMI_FAILURE)
Expand Down