Default data reflection #169
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 6 commits
October 28, 2022 15:23
Loading multiple type libraries with default data resulted in DL_ERROR_OUT_OF_DEFAULT_VALUE_SLOTS.
Merge remote-tracking branch 'origin/master' into default_data_reflection
Fixed pointer patching of default values Fixed merging of identical strings when packing json data
Tisten
commented
Nov 4, 2022
| @@ -139,63 +140,6 @@ dl_error_t DL_DLL_EXPORT dl_instance_load_inplace( dl_ctx_t dl_ctx, | |||
| return DL_ERROR_OK; | |||
| } | |||
|
|
|||
| struct CDLBinStoreContext | |||
There was a problem hiding this comment.
Moved to new private header: "dl_store.h"
Tisten
commented
Nov 4, 2022
| @@ -1,6 +1,30 @@ | |||
| #include "dl_patch_ptr.h" | |||
| #include "dl_types.h" | |||
|
|
|||
| struct dl_patched_ptrs | |||
There was a problem hiding this comment.
This is a plain "undo" of the things mentioned here: https://github.com/wc-duck/datalibrary/pull/158/files#r1000718654
Tisten
commented
Nov 4, 2022
| @@ -122,12 +123,27 @@ dl_error_t DL_DLL_EXPORT dl_reflect_get_type_members( dl_ctx_t dl_ctx, dl_typeid | |||
| if(members_size < type->member_count) | |||
| return DL_ERROR_BUFFER_TOO_SMALL; | |||
|
|
|||
| if (!dl_ctx->default_data_patched) | |||
There was a problem hiding this comment.
This is the internal state I want to avoid by storing the default data in a persistant memory location instead of reallocating a buffer and moving around the data every time new types are added/loaded, discuss it here #161 (comment)
added 2 commits
November 4, 2022 10:44
Tisten
commented
Nov 4, 2022
| CArrayStatic<SString, 128>& strings; | ||
| }; | ||
|
|
||
| dl_error_t dl_internal_store_member( dl_ctx_t dl_ctx, const dl_member_desc* member, const uint8_t* instance, CDLBinStoreContext* store_ctx ); |
There was a problem hiding this comment.
Being able to use this interface from dl_txt_pack.cpp means dl_patch_ptr doesn't need to handle pointer recording and string merging for storing. It just patches pointers.
# Conflicts: # src/dl_txt_pack.cpp # tests/unittest2.tld
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Expose default data in the reflection API, solve: #161
The implementation is not "final". Right now there is an internal state which is not thread safe. This is mentioned in the issue above, so please discuss the preferred solution there.
Also includes second iteration of string merging, now doing it when json parsing as well: #14