tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

remove a code to finish job requests when winix exits

Browse Source 
Actually there was a bug and the code was not correctly waiting for the job requests.
This commit is contained in:
Tomasz Sowa
2024-07-02 17:30:35 +02:00
parent 20b40597fd
commit b2f4c065ea
5 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
winixd/core/app.cpp
View File

@@ -934,33 +934,12 @@ void App::Start()
fcgi_request = &cur.request->fcgi_request; fcgi_request = &cur.request->fcgi_request;
} }
WaitForRequestsToFinish();
}
/* /*
* wait for requests from the jobs * we do not wait for some job requests to finish (if there are such requests)
* the job loop will exit immediately when a synchro->is_stop_signal is defined
* and there is no need to process such requests (the www server will return a 50x error
* to the client)
*/ */
void App::WaitForRequestsToFinish()
{
bool is_req_tab_empty = false;
{
Winix::Lock lock(synchro);
system.DeleteOldRequests();
is_req_tab_empty = system.req_tab.empty();
}
while( is_req_tab_empty )
{
log << log3 << "App: waiting for requests to finish..." << logend << logsave;
sleep(1);
{
Winix::Lock lock(synchro);
is_req_tab_empty = system.req_tab.empty();
}
}
} }

1
winixd/core/app.h
View File

@@ -217,7 +217,6 @@ private:
bool DoDatabaseMigration(); bool DoDatabaseMigration();
bool TryToMakeDatabaseMigration(); bool TryToMakeDatabaseMigration();
void WaitForRequestsToFinish();
// !! IMPROVE ME // !! IMPROVE ME

2
winixd/core/job.cpp
View File

@@ -198,6 +198,7 @@ return true;
second thread second thread
*/ */
// second thread (objects locked) // second thread (objects locked)
bool Job::SignalReceived() bool Job::SignalReceived()
{ {
@@ -430,7 +431,6 @@ void Job::RemoveOldRequest(Request * request)
} }
} // namespace Winix } // namespace Winix

1
winixd/core/job.h
View File

@@ -138,6 +138,7 @@ private:
void DoRequestContinuationJob(JobTask & job_task, size_t priority); void DoRequestContinuationJob(JobTask & job_task, size_t priority);
void DoWinixJob(pt::Space & job); void DoWinixJob(pt::Space & job);
void RemoveOldRequest(Request * request); void RemoveOldRequest(Request * request);
void RemoveAllJobsRequests();
PluginRes DoRequestJobs(JobTask & task, long job_id, size_t priority); PluginRes DoRequestJobs(JobTask & task, long job_id, size_t priority);
}; };

4
winixd/core/system.cpp
View File

@@ -1526,9 +1526,9 @@ void System::DeleteOldRequests(bool leave_one_object)
while( i != req_tab.end() ) while( i != req_tab.end() )
{ {
// leave at least one object (even if it is finished) // leave at least one object (even if it is finished)
if( i->run_state == Request::RunState::finished && (!leave_one_object || req_tab.size() > 1) ) if( (i->run_state == Request::RunState::finished || i->run_state == Request::RunState::not_assigned) && (!leave_one_object || req_tab.size() > 1) )
{ {
log << log3 << "System: removing finished request " << cur->request << logend; log << log3 << "System: removing a finished or not assigned request " << cur->request << logend;
std::list<Request>::iterator old_i = i; std::list<Request>::iterator old_i = i;
++i; ++i;
req_tab.erase(old_i); req_tab.erase(old_i);