chore(pipes): WIP fixing CGI stuck in read

include/webserv.hpp

@@ -17,7 +17,7 @@
 
 #define SEND_BUFFER_SIZE 1024 * 100 // 100 KB
 #define BUFFER_SIZE 1025
-#define CGI_TIMEOUT_MS 300000 // 3 seconds
+#define CGI_TIMEOUT_MS 10000
 #define CONFIG_FILE_DEFAULT_PATH "./conf/webserv_default.conf"
 
 #define RED "\033[1;31m"

src/CGIHandler.cpp

@@ -105,11 +105,14 @@ void handleTimeout(int sig)
 
 bool CGIHandler::executeCGI(const MetaVariables &env, HTTPResponse &response)
 {
+	static int enteredCGI = 0;
 	std::cout << RED << "Entering CGIHandler::executeCGI" << RESET << std::endl;
 	std::string cgiOutput;
 	std::vector<std::string> argv = createArgvForExecve(env);
 	std::vector<std::string> envp = env.getForExecve();
 
+	enteredCGI++;
+
 	int pipeFD[2];
 	if (pipe(pipeFD) == -1)
 	{
@@ -127,6 +130,16 @@ bool CGIHandler::executeCGI(const MetaVariables &env, HTTPResponse &response)
 	}
 	else if (pid == 0)
 	{
+		// clang-format off
+		std::vector<std::pair<int, int> > pipes = _eventManager.getPipeFDs();
+		std::cerr << "CGIHandler: pipes: " << pipes.size() << std::endl;
+		for (std::vector<std::pair<int, int> >::const_iterator it = pipes.begin(); it != pipes.end(); ++it)
+		{
+			std::cerr << GREEN << "CLOSING: " << (*it).first << RESET << std::endl;
+			close((*it).first);
+			close((*it).second);
+		}
+		// clang-format on
 		close(pipeFD[0]);
 		dup2(pipeFD[1], STDOUT_FILENO);
 		close(pipeFD[1]);
@@ -159,7 +172,7 @@ bool CGIHandler::executeCGI(const MetaVariables &env, HTTPResponse &response)
 	response.setCGIpipeFD(pipeFD);
 
 	close(pipeFD[1]);
-	EventData data = {1, pid}; // Assuming 1 is the event type for CGI started
+	EventData data = {1, pid, pipeFD[0], pipeFD[1]}; // Assuming 1 is the event type for CGI started
 	std::cout << "CGIHandler: Emitting event indicating a CGI process has started" << std::endl;
 	_eventManager.emit(data); // Emit event indicating a CGI process has started
 	// conn.addCGI(pid);
@@ -168,6 +181,14 @@ bool CGIHandler::executeCGI(const MetaVariables &env, HTTPResponse &response)
 	// TODO: is this used? To which process to you want to send this signal/ @Leo
 	// signal(SIGALRM, handleTimeout);
 	// alarm(4);
+	// loop over pipeFDs
+	// clang-format off
+	std::vector<std::pair<int, int> > pipes = _eventManager.getPipeFDs();
+	for (std::vector<std::pair<int, int> >::const_iterator it = pipes.begin(); it != pipes.end(); ++it)
+	{
+		std::cout << GREEN << "CGIHandler: pipeFDs: " << (*it).first << RESET << std::endl;
+	}
+	// clang-format on
 	std::cout << RED << "Exiting CGIHandler::executeCGI with true" << RESET << std::endl;
 	return true;
 }

src/Server.cpp

@@ -69,7 +69,7 @@ void Server::startPollEventLoop()
 	while (1)
 	{
 		if (_hasCGI)
-			timeout = 1000; // 1 seconds
+			timeout = 500; // 1 seconds
 		else
 			timeout = -1;
 		printConnections("BEFORE POLL", _FDs, _connections, true);
@@ -150,7 +150,7 @@ void Server::waitCGI()
 		{
 			double elapsed = difftime(time(NULL), _connections[i].getCGIStartTime());
 			std::cout << RED << "Elapsed time: " << elapsed << " seconds" << RESET << std::endl;
-			if (_connections[i].getHasCGI() && elapsed > 1)
+			if (_connections[i].getHasCGI() && elapsed > 500)
 			{
 				Debug::log("CGI timed out", Debug::NORMAL);
 
@@ -950,3 +950,20 @@ void Server::findLocationBlock(HTTPRequest &request, ServerBlock &serverBlock, D
 		}
 	}
 }
+
+void Server::addPipeFDs(int pipe0, int pipe1)
+{
+	_pipeFDs.push_back(std::make_pair(pipe0, pipe1));
+	// print the pipe fds
+	for (size_t i = 0; i < _pipeFDs.size(); i++)
+	{
+		std::cout << PURPLE << "Pipe FDs: " << _pipeFDs[i].first << RESET << std::endl;
+	}
+}
+
+// clang-format off
+std::vector<std::pair<int, int> > Server::getPipeFDs() const
+{
+	return _pipeFDs;
+}
+// clang-format on

src/Server.hpp

@@ -40,9 +40,13 @@ class Server
 	void setCGICounter(int counter);
 	bool getHasCGI() const;
 	int getCGICounter() const;
+	// clang-format off
+	std::vector<std::pair<int, int> > getPipeFDs() const;
+	// clang-format on
 	const EventManager &getEventManager() const;
 
 	void addCGI(const EventData &eventData);
+	void addPipeFDs(int pipe0, int pipe1);
 	void removeCGI();
 
   private:
@@ -54,6 +58,9 @@ class Server
 	std::vector<ServerSocket> _serverSockets;
 	std::vector<struct pollfd> _FDs;
 	std::vector<Connection> _connections;
+	// clang-format off
+	std::vector<std::pair<int, int> > _pipeFDs;
+	// clang-format on
 	EventManager &_eventManager;
 
 	bool _hasCGI;

src/events/EventManager.cpp

@@ -3,7 +3,7 @@
 #include "webserv.hpp"
 #include <algorithm> // For std::remove
 #include <iostream>	 // For std::cout
-
+#include "ServerEventListener.hpp"
 // Constructor
 EventManager::EventManager()
 {
@@ -50,6 +50,15 @@ void EventManager::emit(const EventData &eventData)
 	std::cout << "Size of observers: " << _observers.size() << std::endl;
 	for (std::vector<IEventListener *>::iterator it = _observers.begin(); it != _observers.end(); ++it)
 	{
+		ServerEventListener *serverEventListener = dynamic_cast<ServerEventListener *>(*it);
 		(*it)->handleEvent(eventData);
+		std::cout << RED << serverEventListener->getServer().getCGICounter() << RESET << std::endl;
+		_pipeFDs = serverEventListener->getServer().getPipeFDs();
 	}
 }
+// clang-format off
+std::vector<std::pair<int, int> > EventManager::getPipeFDs() const
+{
+	return _pipeFDs;
+}
+//clang-format on

src/events/EventManager.hpp

@@ -11,6 +11,9 @@ class EventManager
 {
   private:
 	std::vector<IEventListener *> _observers; // List of observers
+											  // clang-format off
+	std::vector<std::pair<int, int> > _pipeFDs;
+
   public:
 	EventManager();
 	~EventManager();
@@ -21,6 +24,8 @@ class EventManager
 	void unsubscribe(IEventListener *observer);
 	// void emit(int eventID);
 	void emit(const EventData &eventData);
+	std::vector<std::pair<int, int> > getPipeFDs() const;
+											  // clang-format on
 };
 
 #endif // EVENT_MANAGER_HPP

src/events/IEventListener.hpp

@@ -7,6 +7,8 @@ struct EventData
 {
 	int eventType;
 	int pid;
+	int pipe0;
+	int pipe1;
 };
 
 // Overload << operator for easy printing

src/events/ServerEventListener.cpp

@@ -10,5 +10,8 @@ void ServerEventListener::handleEvent(const EventData &eventData)
 	std::cout << "ServerEventListener::handleEvent: " << eventData << std::endl;
 	// TODO; Create eventually enum for eventID
 	if (eventData.eventType == 1)
+	{
 		server.addCGI(eventData);
+		server.addPipeFDs(eventData.pipe0, eventData.pipe1);
+	}
 }

src/events/ServerEventListener.hpp

@@ -12,6 +12,10 @@ class ServerEventListener : public IEventListener
   public:
 	ServerEventListener(Server &srv);
 	virtual void handleEvent(const EventData &eventData);
+	Server &getServer() const
+	{
+		return server;
+	}
 };
 
 #endif

tests/parallel_cgi/duration_ts.sh

@@ -20,27 +20,27 @@ temp_file=$(mktemp)
 
 # Send requests and collect the times
 for i in {1..3}; do
-    echo "Sending request $i..."
-    {
-        response=$(stdbuf -o0 curl -s -H "Host: www.development_site" $URL)
-        start_time=$(echo "$response" | grep -o 'Start time: [0-9.]*' | grep -o '[0-9.]*')
-        end_time=$(echo "$response" | grep -o 'End time: [0-9.]*' | grep -o '[0-9.]*')
-
-        if [[ -n "$start_time" && -n "$end_time" ]]; then
-            echo "$start_time Request $i: Start time = $start_time" >> "$temp_file"
-            echo "$end_time Request $i: End time = $end_time" >> "$temp_file"
-        else
-            echo "Failed to parse timestamps from request $i response"
-        fi
-    } &
+	echo "Sending request $i..."
+	{
+		response=$(stdbuf -o0 curl -s -H "Host: www.development_site" $URL)
+		start_time=$(echo "$response" | grep -o 'Start time: [0-9.]*' | grep -o '[0-9.]*')
+		end_time=$(echo "$response" | grep -o 'End time: [0-9.]*' | grep -o '[0-9.]*')
+
+		if [[ -n "$start_time" && -n "$end_time" ]]; then
+			echo "$start_time Request $i: Start time = $start_time" >> "$temp_file"
+			echo "$end_time Request $i: End time = $end_time" >> "$temp_file"
+		else
+			echo "Failed to parse timestamps from request $i response"
+		fi
+	} &
 done
 
 # Wait for all background jobs to finish
 wait
 
 # Sort and print the times
 sort -n "$temp_file" | while read -r line; do
-    echo "$line"
+	echo "$line"
 done
 
 # Clean up temporary file

var/www.development_site/cgi-bin/duration_ts.cgi

@@ -4,7 +4,7 @@ import time
 from datetime import datetime
 
 # Define the duration of the counter in seconds
-duration = 6
+duration = 10
 
 # Print the HTTP header
 print("Content-Type: text/html")