clear pending queries&responses on GC

Author: cyberjunk

blakserv/astar.c

@@ -888,19 +888,6 @@ void AStarThreadProc(astar* Astar)
             while (astar_command* cmd = Astar->Commands->dequeue())
                AStarHandleCommand(Astar, cmd);
 
-            // handle all remaining queries
-            while (astar_query* query = AStarQueries.dequeue())
-            {
-               astar_response* response = AStarRunQuery(Astar, query);
-
-               if (response)
-                  AStarResponses.enqueue(response);
-
-			   delete query;
-
-               // don't notify mainthread here, on serversave processing would occur after save/next tick
-               // and therefore too late. if you pause the worker, you must process final queue items yourself
-            }
             Astar->IsPaused = true;
          }
       }
@@ -1066,6 +1053,7 @@ void AStarInitGC()
       AStar[i].DoPause = true;
 
    // wait for workers to get in pause mode
+   // they will process all pending commands first
    while (true)
    {
       bool allpaused = true;
@@ -1078,8 +1066,26 @@ void AStarInitGC()
          break;
    }
 
-   // deliver all final results to their requesters
-   while (AStarDeliverNextResponse()) {};
+   // clear the query queue, just discard them due to
+   // invalid (ids) and monsters get their waiting flag reset on GC
+   while (astar_query* query = AStarQueries.dequeue())
+      delete query;
+   
+   // clear the response queues, free mem of pathnodes we not gonna use
+   while (astar_response* response = AStarResponses.dequeue())
+   {
+      if (response->responseType() == AStarPathResponse)
+      {
+         astar_pathresponse* pathresponse = (astar_pathresponse*)response;
+         while (!pathresponse->path.empty())
+         {
+            astar_path_node* node = pathresponse->path.front();
+            pathresponse->path.pop_front();
+            free(node);          
+         }
+      }
+      delete response;
+   }
 }
 
 void AStarFinishGC()