Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Optimize std::wstring (un)packing

Browse Source 
The string is now converted to and from UTF-8 directly into or from
memory pointed by cursor. Extra buffer allocation and copy has been
dropped.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-08-14 13:22:57 +02:00
parent f3cc5b6064
commit 2ce0c5d259
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/EAPBase/include/EAP.h
View File

@ -1096,9 +1096,14 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::basic_string<c
template<class _Traits, class _Ax> template<class _Traits, class _Ax>
inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::basic_string<wchar_t, _Traits, _Ax> &val) inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::basic_string<wchar_t, _Traits, _Ax> &val)
{ {
std::string val_utf8; size_t count = val.length();
WideCharToMultiByte(CP_UTF8, 0, val, val_utf8, NULL, NULL); assert(wcslen(val.c_str()) == count); // String should not contain zero terminators.
cursor << val_utf8; size_t size_max = cursor.ptr_end - cursor.ptr;
assert(size_max <= INT_MAX);
size_t size = WideCharToMultiByte(CP_UTF8, 0, val.c_str(), (int)count, (char*)cursor.ptr, (int)size_max, NULL, NULL);
assert(!count && !size || count && size);
cursor.ptr += size;
cursor << (unsigned char)0;
} }
@ -1112,9 +1117,11 @@ inline size_t pksizeof(_In_ const std::basic_string<wchar_t, _Traits, _Ax> &val)
template<class _Traits, class _Ax> template<class _Traits, class _Ax>
inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &val) inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &val)
{ {
std::string val_utf8; size_t count_max = cursor.ptr_end - cursor.ptr;
cursor >> val_utf8; size_t count = strnlen((const char*)cursor.ptr, count_max);
MultiByteToWideChar(CP_UTF8, 0, val_utf8, val); assert(count < count_max); // String should be zero terminated.
MultiByteToWideChar(CP_UTF8, 0, (const char*)cursor.ptr, (int)count, val);
cursor.ptr += sizeof(char)*(count + 1);
} }