Skip to content

Wait for submitted threads to end before terminating a command line procedure #446

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

Merged
merged 3 commits into from
Sep 13, 2021
Merged

Wait for submitted threads to end before terminating a command line procedure #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6954116
Wait for submitted threads to end before terminating a command line p…
claudiamurialdo Sep 9, 2021
fbe5afb
Merge branch 'master' into submit-command-line
claudiamurialdo Sep 10, 2021
e37c8a3
Merge branch 'master' into submit-command-line
claudiamurialdo Sep 13, 2021
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
2 changes: 1 addition & 1 deletion dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3410,7 +3410,7 @@ public IGxSession GetSession()
}

internal bool IsStandalone => this._session is GxSession || this._isSumbited || this.HttpContext == null;

internal bool IsSubmited => this._isSumbited;
internal void SetSession(IGxSession value)
{
if (value != null)
Expand Down
18 changes: 17 additions & 1 deletion dotnet/src/dotnetframework/GxClasses/Model/gxproc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public abstract class GXProcedure: GXBaseObject
protected string Gx_out = "";
protected string Gx_docfmt = "";
protected string Gx_docname = "";
const int SLEEP_BETWEEN_CHECKS_ON_THREADS = 500;
public const int IN_NEW_UTL = -2;
private bool disconnectUserAtCleanup;
#if !NETCORE
Expand Down Expand Up @@ -90,6 +90,9 @@ protected void exitApplication()
}
private void exitApplication(bool flushBatchCursor)
{
if (IsMain && !(context as GxContext).IsSubmited)
WaitForThreadPoolEnd();

if (flushBatchCursor)
{
foreach (IGxDataStore ds in context.DataStores)
Expand All @@ -114,6 +117,19 @@ private void exitApplication(bool flushBatchCursor)
#endif

}
void WaitForThreadPoolEnd()
{
bool working = true;
ThreadPool.GetMaxThreads(out int maxWorkerThreads, out _);
while (working)
{
ThreadPool.GetAvailableThreads(out int workerThreads, out _);
if (workerThreads == maxWorkerThreads)
working = false;
else
Thread.Sleep(SLEEP_BETWEEN_CHECKS_ON_THREADS);
}
}
protected virtual bool BatchCursorHolder() { return false; }
protected virtual void printHeaders(){}
protected virtual void printFooters(){}
Expand Down