Skip to content
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

string type with no malloc (WiP for discussion) #128

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

string type with no malloc (WiP for discussion) #128

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions erpc_c/infra/erpc_basic_codec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ void BasicCodec::writePtr(uintptr_t value)

void BasicCodec::writeString(uint32_t length, const char *value)
{
// Just treat the string as binary.
writeBinary(length, reinterpret_cast<const uint8_t *>(value));
// Just treat the string as binary but add trailing NULL.
writeBinary(length + 1, reinterpret_cast<const uint8_t *>(value));
}

void BasicCodec::writeBinary(uint32_t length, const uint8_t *value)
Expand Down
10 changes: 2 additions & 8 deletions erpcgen/src/CGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2258,11 +2258,9 @@ void CGenerator::getEncodeDecodeBuiltin(Group *group, BuiltinType *t, data_map &

if (t->isString())
{
templateData["zeroCopy"] = findAnnotation(structMember, DIRECT_ANNOTATION) && !findAnnotation(structMember, RETAIN_ANNOTATION);
templateData["checkStringNull"] = false;
templateData["withoutAlloc"] = ((structMember->getDirection() == kInoutDirection) ||
(structType && group->getSymbolDirections(structType).count(kInoutDirection))) ?
true :
false;

if (!isFunctionParam)
{
templateData["stringAllocSize"] = getOutputName(structMember) + "_len";
Expand All @@ -2280,10 +2278,6 @@ void CGenerator::getEncodeDecodeBuiltin(Group *group, BuiltinType *t, data_map &
templateData["checkStringNull"] = true;
templateData["stringLocalName"] = getOutputName(structMember);
templateData["stringAllocSize"] = getAnnStringValue(structMember, MAX_LENGTH_ANNOTATION);
if (structMember->getDirection() == kInoutDirection || structMember->getDirection() == kOutDirection)
{
templateData["withoutAlloc"] = true;
}

if (templateData["stringAllocSize"]->getvalue() == "")
{
Expand Down
3 changes: 3 additions & 0 deletions erpcgen/src/annotations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
//! Do not free memory for a parameter in the server shim.
#define RETAIN_ANNOTATION "retain"

//! Do not alloc memory for a parameter in the server shim, just pass the pointer in the received buffer
#define DIRECT_ANNOTATION "direct"

//! Data handled through shared memory area
#define SHARED_ANNOTATION "shared"

Expand Down
31 changes: 21 additions & 10 deletions erpcgen/src/templates/c_coders.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
{% def decodeBuiltinType(info) --------------- BuiltinType %}
{% if info.builtinType == "kStringType" %}
uint32_t {$info.stringLocalName}_len;
{% if (source == "server" && info.zeroCopy) %}
codec->readString(&{$info.stringLocalName}_len, (char**) &{$info.stringLocalName});
{% else %}
char * {$info.stringLocalName}_local;
codec->readString(&{$info.stringLocalName}_len, &{$info.stringLocalName}_local);
{% if ((source == "client" && info.withoutAlloc == false) or source == "server") %}
{$info.name} = (char *) erpc_malloc(({$info.stringAllocSize} + 1) * sizeof(char));
{% if generateAllocErrorChecks == true %}
{% if source == "server" && !info.zeroCopy %}
{$info.name} = ({$info.builtinTypeName}) erpc_malloc(({$info.stringAllocSize} + 1) * sizeof(char));
{% if generateAllocErrorChecks == true %}
if ({$info.name} == NULL)
{
codec->updateStatus(kErpcStatus_MemoryError);
}
else
{
{% endif -- generateAllocErrorChecks == true %}
{% endif -- withoutAlloc %}
{% if (((source == "client" && info.withoutAlloc == false) or source == "server") && generateAllocErrorChecks == true) %} {% endif -- withoutAlloc %}memcpy({$info.name}, {$info.stringLocalName}_local, {$info.stringLocalName}_len);
{% if (((source == "client" && info.withoutAlloc == false) or source == "server") && generateAllocErrorChecks == true) %} {% endif -- withoutAlloc %}({$info.name})[{$info.stringLocalName}_len] = 0;
{% if (((source == "client" && info.withoutAlloc == false) or source == "server") && generateAllocErrorChecks == true) %}
{% endif -- generateAllocErrorChecks == true %}
memcpy({$info.name}, {$info.stringLocalName}_local, {$info.stringLocalName}_len);
({$info.name})[{$info.stringLocalName}_len] = 0;
{% if generateAllocErrorChecks == true %}
}
{% endif -- withoutAlloc && generateAllocErrorChecks %}
{% endif -- generateAllocErrorChecks %}
{% else %}
memcpy({$info.name}, {$info.stringLocalName}_local, {$info.stringLocalName}_len);
({$info.name})[{$info.stringLocalName}_len] = 0;
{% endif -- server && zeroCopy %}
{% endif -- server && !zeroCopy %}
{% else %}
{% if source == "client" && info.pointerScalarTypes %}
codec->read({$info.name});
Expand Down Expand Up @@ -232,7 +239,11 @@ codec->readData({$info.name}, {$info.sizeTemp} * sizeof({$info.builtinTypeName})
{# Encode sending data #}
{% def encodeBuiltinType(info) ----------------- %}
{% if info.builtinType == "kStringType" %}
codec->writeString(strlen({$info.name}), {$info.name});
{% if source == "client" && info.zeroCopy %}
codec->writeString(strlen((char*){$info.name}), (char*){$info.name});
{% else %}
codec->writeBinary(strlen((char*){$info.name}), (uint8_t*){$info.name});
{% endif -- zeroCopy %}
{% else %}
{% if source == "client" && info.pointerScalarTypes %}
codec->write(*{$info.name});
Expand Down
2 changes: 2 additions & 0 deletions erpcgen/src/templates/c_common_functions.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,12 @@ else

{# ---------------- freeData ---------------- #}
{% def freeData(info) %}
{% if !info.zeroCopy %}
if ({$info.freeName})
{
erpc_free({$info.freeName});
}
{% endif %}
{% enddef ------------------------------- freeData %}

{# ---------------- freeStruct ---------------- #}
Expand Down