Factor object user data serialization.

argonne-lcf · May 20, 2024 · a6a9cff · a6a9cff
1 parent 2582691
commit a6a9cff
Show file tree

Hide file tree

Showing 25 changed files with 24 additions and 124 deletions.
diff --git a/src/cconfigspace_internal.h b/src/cconfigspace_internal.h
@@ -1403,12 +1403,14 @@ static inline ccs_result_t
 _ccs_object_serialize_size_with_opts(
 	ccs_object_t                     object,
 	ccs_serialize_format_t           format,
-	size_t                          *buffer_size,
+	size_t                          *cum_size,
 	_ccs_object_serialize_options_t *opts)
 {
 	_ccs_object_internal_t *obj = (_ccs_object_internal_t *)object;
 	CCS_VALIDATE(
-		obj->ops->serialize_size(object, format, buffer_size, opts));
+		obj->ops->serialize_size(object, format, cum_size, opts));
+	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
+		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -1423,6 +1425,8 @@ _ccs_object_serialize_with_opts(
 	_ccs_object_internal_t *obj = (_ccs_object_internal_t *)object;
 	CCS_VALIDATE(
 		obj->ops->serialize(object, format, buffer_size, buffer, opts));
+	CCS_VALIDATE(_ccs_object_serialize_user_data(
+		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/configuration.c b/src/configuration.c
@@ -93,8 +93,6 @@ _ccs_configuration_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -117,8 +115,6 @@ _ccs_configuration_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/configuration_space.c b/src/configuration_space.c
@@ -220,8 +220,6 @@ _ccs_configuration_space_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -244,8 +242,6 @@ _ccs_configuration_space_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/distribution_mixture.c b/src/distribution_mixture.c
@@ -116,8 +116,6 @@ _ccs_distribution_mixture_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -139,8 +137,6 @@ _ccs_distribution_mixture_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/distribution_multivariate.c b/src/distribution_multivariate.c
@@ -110,8 +110,6 @@ _ccs_distribution_multivariate_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -133,8 +131,6 @@ _ccs_distribution_multivariate_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/distribution_normal.c b/src/distribution_normal.c
@@ -97,6 +97,7 @@ _ccs_distribution_normal_serialize_size(
 	size_t                          *cum_size,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	switch (format) {
 	case CCS_SERIALIZE_FORMAT_BINARY:
 		*cum_size += _ccs_serialize_bin_size_ccs_distribution_normal(
@@ -107,8 +108,6 @@ _ccs_distribution_normal_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -120,6 +119,7 @@ _ccs_distribution_normal_serialize(
 	char                           **buffer,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	switch (format) {
 	case CCS_SERIALIZE_FORMAT_BINARY:
 		CCS_VALIDATE(_ccs_serialize_bin_ccs_distribution_normal(
@@ -130,8 +130,6 @@ _ccs_distribution_normal_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/distribution_roulette.c b/src/distribution_roulette.c
@@ -83,6 +83,7 @@ _ccs_distribution_roulette_serialize_size(
 	size_t                          *cum_size,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	switch (format) {
 	case CCS_SERIALIZE_FORMAT_BINARY:
 		*cum_size += _ccs_serialize_bin_size_ccs_distribution_roulette(
@@ -93,8 +94,6 @@ _ccs_distribution_roulette_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -106,6 +105,7 @@ _ccs_distribution_roulette_serialize(
 	char                           **buffer,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	switch (format) {
 	case CCS_SERIALIZE_FORMAT_BINARY:
 		CCS_VALIDATE(_ccs_serialize_bin_ccs_distribution_roulette(
@@ -116,8 +116,6 @@ _ccs_distribution_roulette_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/distribution_space.c b/src/distribution_space.c
@@ -132,11 +132,6 @@ _ccs_distribution_space_serialize_size(
 			err, CCS_RESULT_ERROR_INVALID_VALUE, end,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE_ERR_GOTO(
-		err,
-		_ccs_object_serialize_user_data_size(
-			object, format, cum_size, opts),
-		end);
 end:
 	CCS_OBJ_UNLOCK(object);
 	return err;
@@ -166,11 +161,6 @@ _ccs_distribution_space_serialize(
 			err, CCS_RESULT_ERROR_INVALID_VALUE, end,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE_ERR_GOTO(
-		err,
-		_ccs_object_serialize_user_data(
-			object, format, buffer_size, buffer, opts),
-		end);
 end:
 	CCS_OBJ_UNLOCK(object);
 	return err;

diff --git a/src/distribution_uniform.c b/src/distribution_uniform.c
@@ -108,6 +108,7 @@ _ccs_distribution_uniform_serialize_size(
 	size_t                          *cum_size,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	switch (format) {
 	case CCS_SERIALIZE_FORMAT_BINARY:
 		*cum_size += _ccs_serialize_bin_size_ccs_distribution_uniform(
@@ -118,8 +119,6 @@ _ccs_distribution_uniform_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -131,6 +130,7 @@ _ccs_distribution_uniform_serialize(
 	char                           **buffer,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	switch (format) {
 	case CCS_SERIALIZE_FORMAT_BINARY:
 		CCS_VALIDATE(_ccs_serialize_bin_ccs_distribution_uniform(
@@ -141,8 +141,6 @@ _ccs_distribution_uniform_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/evaluation.c b/src/evaluation.c
@@ -97,8 +97,6 @@ _ccs_evaluation_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -120,8 +118,6 @@ _ccs_evaluation_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/expression.c b/src/expression.c
@@ -181,8 +181,6 @@ _ccs_expression_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -204,8 +202,6 @@ _ccs_expression_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -1128,8 +1124,6 @@ _ccs_expression_literal_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -1151,8 +1145,6 @@ _ccs_expression_literal_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -1257,8 +1249,6 @@ _ccs_expression_variable_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -1280,8 +1270,6 @@ _ccs_expression_variable_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/feature_space.c b/src/feature_space.c
@@ -39,8 +39,6 @@ _ccs_feature_space_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -62,8 +60,6 @@ _ccs_feature_space_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/features.c b/src/features.c
@@ -20,6 +20,7 @@ _ccs_features_serialize_size(
 	size_t                          *cum_size,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	switch (format) {
 	case CCS_SERIALIZE_FORMAT_BINARY:
 		CCS_VALIDATE(_ccs_serialize_bin_size_ccs_binding(
@@ -30,8 +31,6 @@ _ccs_features_serialize_size(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data_size(
-		object, format, cum_size, opts));
 	return CCS_RESULT_SUCCESS;
 }
 
@@ -43,6 +42,7 @@ _ccs_features_serialize(
 	char                           **buffer,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	switch (format) {
 	case CCS_SERIALIZE_FORMAT_BINARY:
 		CCS_VALIDATE(_ccs_serialize_bin_ccs_binding(
@@ -53,8 +53,6 @@ _ccs_features_serialize(
 			CCS_RESULT_ERROR_INVALID_VALUE,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE(_ccs_object_serialize_user_data(
-		object, format, buffer_size, buffer, opts));
 	return CCS_RESULT_SUCCESS;
 }
 

diff --git a/src/map.c b/src/map.c
@@ -106,6 +106,7 @@ _ccs_map_serialize_size(
 	size_t                          *cum_size,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	ccs_result_t err = CCS_RESULT_SUCCESS;
 	CCS_OBJ_RDLOCK(object);
 	switch (format) {
@@ -117,11 +118,6 @@ _ccs_map_serialize_size(
 			err, CCS_RESULT_ERROR_INVALID_VALUE, end,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE_ERR_GOTO(
-		err,
-		_ccs_object_serialize_user_data_size(
-			object, format, cum_size, opts),
-		end);
 end:
 	CCS_OBJ_UNLOCK(object);
 	return err;
@@ -135,6 +131,7 @@ _ccs_map_serialize(
 	char                           **buffer,
 	_ccs_object_serialize_options_t *opts)
 {
+	(void)opts;
 	ccs_result_t err = CCS_RESULT_SUCCESS;
 	CCS_OBJ_RDLOCK(object);
 	switch (format) {
@@ -150,11 +147,6 @@ _ccs_map_serialize(
 			err, CCS_RESULT_ERROR_INVALID_VALUE, end,
 			"Unsupported serialization format: %d", format);
 	}
-	CCS_VALIDATE_ERR_GOTO(
-		err,
-		_ccs_object_serialize_user_data(
-			object, format, buffer_size, buffer, opts),
-		end);
 end:
 	CCS_OBJ_UNLOCK(object);
 	return err;