MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

1. Fixed valgrind issue

Browse Source 
2. Updated child_process, to now have back-parent pointer on completion
This commit is contained in:
Bryan Roe
2021-02-16 21:59:48 -08:00
parent 71b5e588c3
commit ebf06898b2
4 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
microscript/ILibDuktape_ChildProcess.c
View File

@@ -32,6 +32,7 @@ limitations under the License.
#define ILibDuktape_ChildProcess_Process "\xFF_ChildProcess_Process"
#define ILibDuktape_ChildProcess_MemBuf "\xFF_ChildProcess_MemBuf"
extern int g_displayFinalizerMessages;
typedef struct ILibDuktape_ChildProcess_SubProcess
{
@@ -50,6 +51,16 @@ typedef struct ILibDuktape_ChildProcess_SubProcess
int exitCode;
}ILibDuktape_ChildProcess_SubProcess;
void ILibDuktape_ChildProcess_DeleteBackReferences(duk_context *ctx, duk_idx_t i, char *name)
{
if (duk_has_prop_string(ctx, i, name))
{
duk_get_prop_string(ctx, i, name); // [sub]
duk_del_prop_string(ctx, -1, "parent");
duk_pop(ctx); // ...
}
}
void ILibDuktape_ChildProcess_SubProcess_StdOut_OnPause(ILibDuktape_readableStream *sender, void *user)
{
ILibDuktape_ChildProcess_SubProcess *p = (ILibDuktape_ChildProcess_SubProcess*)user;
@@ -87,6 +98,19 @@ ILibTransport_DoneState ILibDuktape_ChildProcess_SubProcess_StdIn_WriteHandler(I
ILibDuktape_ChildProcess_SubProcess *p = (ILibDuktape_ChildProcess_SubProcess*)user;
if (ILibMemory_CanaryOK(p->childProcess))
{
if (g_displayFinalizerMessages)
{
duk_push_this(stream->ctx);
if (!duk_has_prop_string(stream->ctx, -1, "\xFF_WroteDebug"))
{
char tmp[100] = { 0 };
memcpy_s(tmp, sizeof(tmp), buffer, bufferLen > sizeof(tmp) ? sizeof(tmp) - 1 : bufferLen);
duk_push_true(stream->ctx);
duk_put_prop_string(stream->ctx, -2, "\xFF_WroteDebug");
printf(" => [%s]\n", tmp);
}
duk_pop(stream->ctx);
}
return(ILibProcessPipe_Process_WriteStdIn(p->childProcess, buffer, bufferLen, ILibTransport_MemoryOwnership_USER));
}
else
@@ -110,6 +134,7 @@ void ILibDuktape_ChildProcess_SubProcess_ExitHandler_sink1(void *chain, void *us
ILibDuktape_ChildProcess_SubProcess_ExitHandler(NULL, p->exitCode, p);
}
void ILibDuktape_ChildProcess_SubProcess_ExitHandler(ILibProcessPipe_Process sender, int exitCode, void* user)
{
ILibDuktape_ChildProcess_SubProcess *p = (ILibDuktape_ChildProcess_SubProcess*)user;
@@ -124,6 +149,7 @@ void ILibDuktape_ChildProcess_SubProcess_ExitHandler(ILibProcessPipe_Process sen
{
ILibDuktape_EventEmitter_SetupRemoveListener(p->ctx, ILibDuktape_GetProcessObject(p->ctx), "SIGCHLD"); //......][remove][process][SIGCHLD]
duk_get_prop_string(p->ctx, -4, "_sigsink"); // [childProcess][remove][process][SIGCHLD][func]
duk_del_prop_string(p->ctx, -1, "_child");
duk_pcall_method(p->ctx, 2); duk_pop(p->ctx); // [childProcess]
}
#endif
@@ -140,6 +166,12 @@ void ILibDuktape_ChildProcess_SubProcess_ExitHandler(ILibProcessPipe_Process sen
duk_push_null(p->ctx); // [emit][this][exit][exitCode][sig]
if (duk_pcall_method(p->ctx, 3) != 0) { ILibDuktape_Process_UncaughtExceptionEx(p->ctx, "child_process.subProcess.exit(): "); }
duk_pop(p->ctx);
duk_push_heapptr(p->ctx, p->subProcess); // [childProcess]
ILibDuktape_ChildProcess_DeleteBackReferences(p->ctx, -1, "stdin");
ILibDuktape_ChildProcess_DeleteBackReferences(p->ctx, -1, "stdout");
ILibDuktape_ChildProcess_DeleteBackReferences(p->ctx, -1, "stderr");
duk_pop(p->ctx); // ...
}
void ILibDuktape_ChildProcess_SubProcess_StdOutHandler(ILibProcessPipe_Process sender, char *buffer, size_t bufferLen, size_t* bytesConsumed, void* user)
{
@@ -322,8 +354,17 @@ duk_ret_t ILibDuktape_SpawnedProcess_SIGCHLD_sink(duk_context *ctx)
{
ILibDuktape_ChildProcess_SubProcess_ExitHandler(childprocess->childProcess, statusCode, childprocess);
}
duk_push_heapptr(ctx, child);
ILibDuktape_ChildProcess_DeleteBackReferences(ctx, -1, "stdin");
ILibDuktape_ChildProcess_DeleteBackReferences(ctx, -1, "stdout");
ILibDuktape_ChildProcess_DeleteBackReferences(ctx, -1, "stderr");
duk_pop(ctx);
}
duk_push_current_function(ctx); // [func]
duk_del_prop_string(ctx, -1, "_child");
duk_pop(ctx); // ...
duk_push_heapptr(ctx, child); // [child]
void *mProcess = Duktape_GetPointerProperty(ctx, -1, ILibDuktape_ChildProcess_Process);
if (mProcess != NULL)
@@ -366,22 +407,19 @@ ILibDuktape_ChildProcess_SubProcess* ILibDuktape_ChildProcess_SpawnedProcess_PUS
duk_push_object(ctx);
ILibDuktape_WriteID(ctx, "childProcess.subProcess.stdout");
duk_dup(ctx, -2);
ILibDuktape_CreateReadonlyProperty(ctx, "parent");
duk_dup(ctx, -2); duk_put_prop_string(ctx, -2, "parent");
retVal->stdOut = ILibDuktape_ReadableStream_Init(ctx, ILibDuktape_ChildProcess_SubProcess_StdOut_OnPause, ILibDuktape_ChildProcess_SubProcess_StdOut_OnResume, retVal);
ILibDuktape_CreateReadonlyProperty(ctx, "stdout");
duk_push_object(ctx);
ILibDuktape_WriteID(ctx, "childProcess.subProcess.stderr");
duk_dup(ctx, -2);
ILibDuktape_CreateReadonlyProperty(ctx, "parent");
duk_dup(ctx, -2); duk_put_prop_string(ctx, -2, "parent");
retVal->stdErr = ILibDuktape_ReadableStream_Init(ctx, ILibDuktape_ChildProcess_SubProcess_StdErr_OnPause, ILibDuktape_ChildProcess_SubProcess_StdErr_OnResume, retVal);
ILibDuktape_CreateReadonlyProperty(ctx, "stderr");
duk_push_object(ctx);
ILibDuktape_WriteID(ctx, "childProcess.subProcess.stdin");
duk_dup(ctx, -2);
ILibDuktape_CreateReadonlyProperty(ctx, "parent");
duk_dup(ctx, -2); duk_put_prop_string(ctx, -2, "parent");
retVal->stdIn = ILibDuktape_WritableStream_Init(ctx, ILibDuktape_ChildProcess_SubProcess_StdIn_WriteHandler, ILibDuktape_ChildProcess_SubProcess_StdIn_EndHandler, retVal);
ILibDuktape_CreateReadonlyProperty(ctx, "stdin");
#ifndef WIN32
@@ -407,6 +445,7 @@ ILibDuktape_ChildProcess_SubProcess* ILibDuktape_ChildProcess_SpawnedProcess_PUS
if (callback != NULL) { ILibDuktape_EventEmitter_AddOnce(emitter, "exit", callback); }
}
#if defined(_POSIX)
ILibDuktape_EventEmitter_SetupOn(ctx, ILibDuktape_GetProcessObject(ctx), "SIGCHLD"); // [child][on][process][SIGCHLD]
duk_push_c_function(ctx, ILibDuktape_SpawnedProcess_SIGCHLD_sink, DUK_VARARGS); // [child][on][process][SIGCHLD][func]
@@ -537,6 +576,10 @@ duk_ret_t ILibDuktape_ChildProcess_execFile(duk_context *ctx)
return(ILibDuktape_Error(ctx, "child_process.execFile(): Could not exec [%s]", target));
}
ILibDuktape_ChildProcess_SpawnedProcess_PUSH(ctx, p, callback);
if (g_displayFinalizerMessages)
{
printf("++++ childProcess.subProcess (pid: %u, %s) [%p]\n", ILibProcessPipe_Process_GetPID(p), target, duk_get_heapptr(ctx, -1));
}
duk_push_string(ctx, target); duk_put_prop_string(ctx, -2, "_target");
duk_push_pointer(ctx, manager); duk_put_prop_string(ctx, -2, ILibDuktape_ChildProcess_Manager);
return(1);

3
microscript/ILibDuktape_Helpers.c
View File

@@ -260,7 +260,7 @@ void *Duktape_Duplicate_GetBufferPropertyEx(duk_context *ctx, duk_idx_t i, char*
source = Duktape_GetBufferPropertyEx(ctx, i, propertyName, &sourceLen);
if (sourceLen > 0)
{
retVal = ILibMemory_SmartAllocate(sourceLen);
retVal = ILibMemory_SmartAllocate(sourceLen+1);
memcpy_s(retVal, sourceLen, source, sourceLen);
if (bufferLen != NULL) { *bufferLen = sourceLen; }
}
@@ -786,6 +786,7 @@ void Duktape_SafeDestroyHeap(duk_context *ctx)
duk_set_top(ctx, top);
}
duk_require_stack(ctx, 2 * DUK_API_ENTRY_STACK);
duk_destroy_heap(ctx);
if (ctxd->fakechain != 0 && ctxd->chain != NULL)

4
microscript/ILibDuktape_ScriptContainer.c
View File

@@ -1604,10 +1604,6 @@ void *ILibDuktape_ScriptContainer_Engine_realloc(void *udata, void *ptr, duk_siz
}
}
if (ptr == NULL)
{
printf("PTR WAS NULL!\n");
}
return(ptr);
}
void ILibDuktape_ScriptContainer_Engine_free(void *udata, void *ptr)

2
microscript/ILibDuktape_fs.c
View File

@@ -2242,7 +2242,7 @@ duk_ret_t ILibDuktape_fs_readFileSync(duk_context *ctx)
char *buffer = (char*)duk_push_dynamic_buffer(ctx, bufferSize); // [dynamicBuffer]
size_t bytesRead = 0;
size_t len = 0;
while ((bytesRead = fread(buffer + len, 1, 1024, f)) > 0)
while ((bytesRead = fread(buffer + len, 1,(bufferSize-len)>1024?1024:(bufferSize-len), f)) > 0)
{
len += bytesRead;
if (bytesRead == 1024)