From c02586a28d2fd5bf5d75df24e435561d1adc3cb5 Mon Sep 17 00:00:00 2001 From: jgo-42 Date: Mon, 6 Nov 2023 20:20:29 +0900 Subject: [PATCH] [WWM-91] feat(SharedData): implement SharedData and restructured project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sharedData클래스로 변경한 후 폴더 AEventHandler내에 있는 IOHandler를 위한 폴더를 따로 만들었습니다. --- src/Reactor/AEventHandler/AEventHandler.h | 16 +--------- src/Reactor/AEventHandler/AEventHandler.hpp | 10 +++--- .../ClientRequestHandler.cpp | 2 +- .../ServerAcceptHandler.cpp | 2 +- .../ClientReadHandler/ClientReadHandler.cpp | 0 .../ClientReadHandler/ClientReadHandler.h | 0 .../ClientReadHandler/ClientReadHandler.hpp | 0 .../ClientReadHandler/Makefile | 2 +- .../ClientWriteHandler/ClientWriteHandler.cpp | 0 .../ClientWriteHandler/ClientWriteHandler.h | 0 .../ClientWriteHandler/ClientWriteHandler.hpp | 0 .../ClientWriteHandler/Makefile | 2 +- .../FileReadHandler/FileReadHandler.cpp | 0 .../FileReadHandler/FileReadHandler.h | 0 .../FileReadHandler/FileReadHandler.hpp | 0 .../{ => IOHandler}/FileReadHandler/Makefile | 2 +- .../FileWriteHandler/FileWriteHandler.cpp | 0 .../FileWriteHandler/FileWriteHandler.h | 0 .../FileWriteHandler/FileWriteHandler.hpp | 0 .../{ => IOHandler}/FileWriteHandler/Makefile | 2 +- src/Reactor/AEventHandler/IOHandler/Makefile | 17 ++++++++++ .../ServerReadHandler/Makefile | 2 +- .../ServerReadHandler/ServerReadHandler.cpp | 0 .../ServerReadHandler/ServerReadHandler.h | 0 .../ServerReadHandler/ServerReadHandler.hpp | 0 src/Reactor/AEventHandler/Makefile | 7 ++--- src/Reactor/AEventHandler/SharedData/Makefile | 18 +++++++++++ .../AEventHandler/SharedData/SharedData.cpp | 22 +++++++++++++ .../AEventHandler/SharedData/SharedData.h | 9 ++++++ .../AEventHandler/SharedData/SharedData.hpp | 31 +++++++++++++++++++ src/Reactor/Dispatcher/Dispatcher.hpp | 6 ++-- src/ServerManager/ServerManager.cpp | 2 +- 32 files changed, 116 insertions(+), 36 deletions(-) rename src/Reactor/AEventHandler/{ => IOHandler}/ClientReadHandler/ClientReadHandler.cpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/ClientReadHandler/ClientReadHandler.h (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/ClientReadHandler/ClientReadHandler.hpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/ClientReadHandler/Makefile (90%) rename src/Reactor/AEventHandler/{ => IOHandler}/ClientWriteHandler/ClientWriteHandler.cpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/ClientWriteHandler/ClientWriteHandler.h (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/ClientWriteHandler/ClientWriteHandler.hpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/ClientWriteHandler/Makefile (90%) rename src/Reactor/AEventHandler/{ => IOHandler}/FileReadHandler/FileReadHandler.cpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/FileReadHandler/FileReadHandler.h (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/FileReadHandler/FileReadHandler.hpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/FileReadHandler/Makefile (90%) rename src/Reactor/AEventHandler/{ => IOHandler}/FileWriteHandler/FileWriteHandler.cpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/FileWriteHandler/FileWriteHandler.h (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/FileWriteHandler/FileWriteHandler.hpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/FileWriteHandler/Makefile (90%) create mode 100644 src/Reactor/AEventHandler/IOHandler/Makefile rename src/Reactor/AEventHandler/{ => IOHandler}/ServerReadHandler/Makefile (90%) rename src/Reactor/AEventHandler/{ => IOHandler}/ServerReadHandler/ServerReadHandler.cpp (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/ServerReadHandler/ServerReadHandler.h (100%) rename src/Reactor/AEventHandler/{ => IOHandler}/ServerReadHandler/ServerReadHandler.hpp (100%) create mode 100644 src/Reactor/AEventHandler/SharedData/Makefile create mode 100644 src/Reactor/AEventHandler/SharedData/SharedData.cpp create mode 100644 src/Reactor/AEventHandler/SharedData/SharedData.h create mode 100644 src/Reactor/AEventHandler/SharedData/SharedData.hpp diff --git a/src/Reactor/AEventHandler/AEventHandler.h b/src/Reactor/AEventHandler/AEventHandler.h index 6908d2d..32e62f2 100644 --- a/src/Reactor/AEventHandler/AEventHandler.h +++ b/src/Reactor/AEventHandler/AEventHandler.h @@ -3,20 +3,6 @@ #define AEVENTHANDLER_H #include -#include "enum.h" -#include "shared_ptr.hpp" -#include "types.h" - -struct sharedData { - const fd_t fd; - const enum EventType type; - std::vector buffer; - enum AsyncState state; - - sharedData(const fd_t fd, const enum EventType type, std::vector buffer) - : fd(fd), type(type), buffer(buffer), state(PENDING){}; -}; - -typedef utils::shared_ptr sharedData_t; +#include "SharedData.hpp" #endif diff --git a/src/Reactor/AEventHandler/AEventHandler.hpp b/src/Reactor/AEventHandler/AEventHandler.hpp index dd7ebb9..9e7d575 100644 --- a/src/Reactor/AEventHandler/AEventHandler.hpp +++ b/src/Reactor/AEventHandler/AEventHandler.hpp @@ -15,11 +15,11 @@ namespace reactor { AEventHandler(sharedData_t& sharedData) : _sharedData(sharedData){}; virtual ~AEventHandler(){}; sharedData_t getData() const { return this->_sharedData; }; - handle_t getHandle() const { return this->_sharedData.get()->fd; }; - std::vector& getBuffer() { return this->_sharedData.get()->buffer; }; - enum EventType getType() const { return this->_sharedData.get()->type; }; - enum AsyncState getState() const { return this->_sharedData.get()->state; }; - void setState(const enum AsyncState state) { this->_sharedData.get()->state = state; }; + handle_t getHandle() const { return this->_sharedData.get()->getFd(); }; + std::vector& getBuffer() { return this->_sharedData.get()->getBuffer(); }; + enum EventType getType() const { return this->_sharedData.get()->getType(); }; + enum AsyncState getState() const { return this->_sharedData.get()->getState(); }; + void setState(const enum AsyncState state) { this->_sharedData->setState(state); }; virtual void handleEvent() = 0; }; diff --git a/src/Reactor/AEventHandler/AExeHandler/ClientRequestHandler/ClientRequestHandler.cpp b/src/Reactor/AEventHandler/AExeHandler/ClientRequestHandler/ClientRequestHandler.cpp index b759e16..798b3b0 100644 --- a/src/Reactor/AEventHandler/AExeHandler/ClientRequestHandler/ClientRequestHandler.cpp +++ b/src/Reactor/AEventHandler/AExeHandler/ClientRequestHandler/ClientRequestHandler.cpp @@ -3,7 +3,7 @@ namespace reactor { ClientRequestHandler::ClientRequestHandler(sharedData_t& sharedData, va_list args) - : AExeHandler(sharedData), _request(ServerManager::getInstance()->getServerConfig(sharedData.get()->fd)) { + : AExeHandler(sharedData), _request(ServerManager::getInstance()->getServerConfig(sharedData.get()->getFd())) { Dispatcher::getInstance()->registerIOHandler(sharedData); va_end(args); } diff --git a/src/Reactor/AEventHandler/AExeHandler/ServerAcceptHandler/ServerAcceptHandler.cpp b/src/Reactor/AEventHandler/AExeHandler/ServerAcceptHandler/ServerAcceptHandler.cpp index 3909738..5736871 100644 --- a/src/Reactor/AEventHandler/AExeHandler/ServerAcceptHandler/ServerAcceptHandler.cpp +++ b/src/Reactor/AEventHandler/AExeHandler/ServerAcceptHandler/ServerAcceptHandler.cpp @@ -33,7 +33,7 @@ namespace reactor { throw; } Dispatcher::getInstance()->registerExeHandler( - sharedData_t(new sharedData(clientFd, EVENT_READ, std::vector()))); + sharedData_t(new SharedData(clientFd, EVENT_READ, std::vector()))); this->setState(PENDING); // Dispatcher::getInstance()->removeExeHandler(u::shared_ptr(this)); } diff --git a/src/Reactor/AEventHandler/ClientReadHandler/ClientReadHandler.cpp b/src/Reactor/AEventHandler/IOHandler/ClientReadHandler/ClientReadHandler.cpp similarity index 100% rename from src/Reactor/AEventHandler/ClientReadHandler/ClientReadHandler.cpp rename to src/Reactor/AEventHandler/IOHandler/ClientReadHandler/ClientReadHandler.cpp diff --git a/src/Reactor/AEventHandler/ClientReadHandler/ClientReadHandler.h b/src/Reactor/AEventHandler/IOHandler/ClientReadHandler/ClientReadHandler.h similarity index 100% rename from src/Reactor/AEventHandler/ClientReadHandler/ClientReadHandler.h rename to src/Reactor/AEventHandler/IOHandler/ClientReadHandler/ClientReadHandler.h diff --git a/src/Reactor/AEventHandler/ClientReadHandler/ClientReadHandler.hpp b/src/Reactor/AEventHandler/IOHandler/ClientReadHandler/ClientReadHandler.hpp similarity index 100% rename from src/Reactor/AEventHandler/ClientReadHandler/ClientReadHandler.hpp rename to src/Reactor/AEventHandler/IOHandler/ClientReadHandler/ClientReadHandler.hpp diff --git a/src/Reactor/AEventHandler/ClientReadHandler/Makefile b/src/Reactor/AEventHandler/IOHandler/ClientReadHandler/Makefile similarity index 90% rename from src/Reactor/AEventHandler/ClientReadHandler/Makefile rename to src/Reactor/AEventHandler/IOHandler/ClientReadHandler/Makefile index eed974c..d48a424 100644 --- a/src/Reactor/AEventHandler/ClientReadHandler/Makefile +++ b/src/Reactor/AEventHandler/IOHandler/ClientReadHandler/Makefile @@ -3,7 +3,7 @@ ifndef TOPDIR endif ifndef DSTDIR - DSTDIR := $(abspath ../../) + DSTDIR := $(abspath ../../../) endif include $(TOPDIR)/config/makefile/common.mk diff --git a/src/Reactor/AEventHandler/ClientWriteHandler/ClientWriteHandler.cpp b/src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/ClientWriteHandler.cpp similarity index 100% rename from src/Reactor/AEventHandler/ClientWriteHandler/ClientWriteHandler.cpp rename to src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/ClientWriteHandler.cpp diff --git a/src/Reactor/AEventHandler/ClientWriteHandler/ClientWriteHandler.h b/src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/ClientWriteHandler.h similarity index 100% rename from src/Reactor/AEventHandler/ClientWriteHandler/ClientWriteHandler.h rename to src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/ClientWriteHandler.h diff --git a/src/Reactor/AEventHandler/ClientWriteHandler/ClientWriteHandler.hpp b/src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/ClientWriteHandler.hpp similarity index 100% rename from src/Reactor/AEventHandler/ClientWriteHandler/ClientWriteHandler.hpp rename to src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/ClientWriteHandler.hpp diff --git a/src/Reactor/AEventHandler/ClientWriteHandler/Makefile b/src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/Makefile similarity index 90% rename from src/Reactor/AEventHandler/ClientWriteHandler/Makefile rename to src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/Makefile index f5089e1..d2c67c2 100644 --- a/src/Reactor/AEventHandler/ClientWriteHandler/Makefile +++ b/src/Reactor/AEventHandler/IOHandler/ClientWriteHandler/Makefile @@ -3,7 +3,7 @@ ifndef TOPDIR endif ifndef DSTDIR - DSTDIR := $(abspath ../../) + DSTDIR := $(abspath ../../../) endif include $(TOPDIR)/config/makefile/common.mk diff --git a/src/Reactor/AEventHandler/FileReadHandler/FileReadHandler.cpp b/src/Reactor/AEventHandler/IOHandler/FileReadHandler/FileReadHandler.cpp similarity index 100% rename from src/Reactor/AEventHandler/FileReadHandler/FileReadHandler.cpp rename to src/Reactor/AEventHandler/IOHandler/FileReadHandler/FileReadHandler.cpp diff --git a/src/Reactor/AEventHandler/FileReadHandler/FileReadHandler.h b/src/Reactor/AEventHandler/IOHandler/FileReadHandler/FileReadHandler.h similarity index 100% rename from src/Reactor/AEventHandler/FileReadHandler/FileReadHandler.h rename to src/Reactor/AEventHandler/IOHandler/FileReadHandler/FileReadHandler.h diff --git a/src/Reactor/AEventHandler/FileReadHandler/FileReadHandler.hpp b/src/Reactor/AEventHandler/IOHandler/FileReadHandler/FileReadHandler.hpp similarity index 100% rename from src/Reactor/AEventHandler/FileReadHandler/FileReadHandler.hpp rename to src/Reactor/AEventHandler/IOHandler/FileReadHandler/FileReadHandler.hpp diff --git a/src/Reactor/AEventHandler/FileReadHandler/Makefile b/src/Reactor/AEventHandler/IOHandler/FileReadHandler/Makefile similarity index 90% rename from src/Reactor/AEventHandler/FileReadHandler/Makefile rename to src/Reactor/AEventHandler/IOHandler/FileReadHandler/Makefile index d9617db..59ad943 100644 --- a/src/Reactor/AEventHandler/FileReadHandler/Makefile +++ b/src/Reactor/AEventHandler/IOHandler/FileReadHandler/Makefile @@ -3,7 +3,7 @@ ifndef TOPDIR endif ifndef DSTDIR - DSTDIR := $(abspath ../../) + DSTDIR := $(abspath ../../../) endif include $(TOPDIR)/config/makefile/common.mk diff --git a/src/Reactor/AEventHandler/FileWriteHandler/FileWriteHandler.cpp b/src/Reactor/AEventHandler/IOHandler/FileWriteHandler/FileWriteHandler.cpp similarity index 100% rename from src/Reactor/AEventHandler/FileWriteHandler/FileWriteHandler.cpp rename to src/Reactor/AEventHandler/IOHandler/FileWriteHandler/FileWriteHandler.cpp diff --git a/src/Reactor/AEventHandler/FileWriteHandler/FileWriteHandler.h b/src/Reactor/AEventHandler/IOHandler/FileWriteHandler/FileWriteHandler.h similarity index 100% rename from src/Reactor/AEventHandler/FileWriteHandler/FileWriteHandler.h rename to src/Reactor/AEventHandler/IOHandler/FileWriteHandler/FileWriteHandler.h diff --git a/src/Reactor/AEventHandler/FileWriteHandler/FileWriteHandler.hpp b/src/Reactor/AEventHandler/IOHandler/FileWriteHandler/FileWriteHandler.hpp similarity index 100% rename from src/Reactor/AEventHandler/FileWriteHandler/FileWriteHandler.hpp rename to src/Reactor/AEventHandler/IOHandler/FileWriteHandler/FileWriteHandler.hpp diff --git a/src/Reactor/AEventHandler/FileWriteHandler/Makefile b/src/Reactor/AEventHandler/IOHandler/FileWriteHandler/Makefile similarity index 90% rename from src/Reactor/AEventHandler/FileWriteHandler/Makefile rename to src/Reactor/AEventHandler/IOHandler/FileWriteHandler/Makefile index 4264ce6..386e565 100644 --- a/src/Reactor/AEventHandler/FileWriteHandler/Makefile +++ b/src/Reactor/AEventHandler/IOHandler/FileWriteHandler/Makefile @@ -3,7 +3,7 @@ ifndef TOPDIR endif ifndef DSTDIR - DSTDIR := $(abspath ../../) + DSTDIR := $(abspath ../../../) endif include $(TOPDIR)/config/makefile/common.mk diff --git a/src/Reactor/AEventHandler/IOHandler/Makefile b/src/Reactor/AEventHandler/IOHandler/Makefile new file mode 100644 index 0000000..376d040 --- /dev/null +++ b/src/Reactor/AEventHandler/IOHandler/Makefile @@ -0,0 +1,17 @@ +ifndef TOPDIR + TOPDIR := $(abspath ../../../../) +endif + +ifndef DSTDIR + DSTDIR := $(abspath ../../) +endif + +include $(TOPDIR)/config/makefile/common.mk + +DIRS := ClientReadHandler \ + ClientWriteHandler \ + FileReadHandler \ + FileWriteHandler \ + ServerReadHandler + +include $(TOPDIR)/config/makefile/objRecipes.mk diff --git a/src/Reactor/AEventHandler/ServerReadHandler/Makefile b/src/Reactor/AEventHandler/IOHandler/ServerReadHandler/Makefile similarity index 90% rename from src/Reactor/AEventHandler/ServerReadHandler/Makefile rename to src/Reactor/AEventHandler/IOHandler/ServerReadHandler/Makefile index 07dfc1e..685516d 100644 --- a/src/Reactor/AEventHandler/ServerReadHandler/Makefile +++ b/src/Reactor/AEventHandler/IOHandler/ServerReadHandler/Makefile @@ -3,7 +3,7 @@ ifndef TOPDIR endif ifndef DSTDIR - DSTDIR := $(abspath ../../) + DSTDIR := $(abspath ../../../) endif include $(TOPDIR)/config/makefile/common.mk diff --git a/src/Reactor/AEventHandler/ServerReadHandler/ServerReadHandler.cpp b/src/Reactor/AEventHandler/IOHandler/ServerReadHandler/ServerReadHandler.cpp similarity index 100% rename from src/Reactor/AEventHandler/ServerReadHandler/ServerReadHandler.cpp rename to src/Reactor/AEventHandler/IOHandler/ServerReadHandler/ServerReadHandler.cpp diff --git a/src/Reactor/AEventHandler/ServerReadHandler/ServerReadHandler.h b/src/Reactor/AEventHandler/IOHandler/ServerReadHandler/ServerReadHandler.h similarity index 100% rename from src/Reactor/AEventHandler/ServerReadHandler/ServerReadHandler.h rename to src/Reactor/AEventHandler/IOHandler/ServerReadHandler/ServerReadHandler.h diff --git a/src/Reactor/AEventHandler/ServerReadHandler/ServerReadHandler.hpp b/src/Reactor/AEventHandler/IOHandler/ServerReadHandler/ServerReadHandler.hpp similarity index 100% rename from src/Reactor/AEventHandler/ServerReadHandler/ServerReadHandler.hpp rename to src/Reactor/AEventHandler/IOHandler/ServerReadHandler/ServerReadHandler.hpp diff --git a/src/Reactor/AEventHandler/Makefile b/src/Reactor/AEventHandler/Makefile index c88d5fd..792cbc3 100644 --- a/src/Reactor/AEventHandler/Makefile +++ b/src/Reactor/AEventHandler/Makefile @@ -9,11 +9,8 @@ endif include $(TOPDIR)/config/makefile/common.mk DIRS := AExeHandler \ - ClientReadHandler \ - ClientWriteHandler \ - FileReadHandler \ - FileWriteHandler \ - ServerReadHandler \ + IOHandler \ + SharedData \ TestAcceptHandler include $(TOPDIR)/config/makefile/objRecipes.mk diff --git a/src/Reactor/AEventHandler/SharedData/Makefile b/src/Reactor/AEventHandler/SharedData/Makefile new file mode 100644 index 0000000..a406bc3 --- /dev/null +++ b/src/Reactor/AEventHandler/SharedData/Makefile @@ -0,0 +1,18 @@ +ifndef TOPDIR + TOPDIR := $(abspath ../../../../) +endif + +ifndef DSTDIR + DSTDIR := $(abspath ../../) +endif + +include $(TOPDIR)/config/makefile/common.mk + +SRCS := $(addprefix $(DSTDIR)/objs/, SharedData.cpp) + +OBJS := $(SRCS:.cpp=.o) +DEPS := $(SRCS:.cpp=.d) + +-include $(DEPS)erverReadHandler + +include $(TOPDIR)/config/makefile/objRecipes.mk diff --git a/src/Reactor/AEventHandler/SharedData/SharedData.cpp b/src/Reactor/AEventHandler/SharedData/SharedData.cpp new file mode 100644 index 0000000..c67edbc --- /dev/null +++ b/src/Reactor/AEventHandler/SharedData/SharedData.cpp @@ -0,0 +1,22 @@ +#include "SharedData.hpp" + +namespace reactor { + SharedData::SharedData(const fd_t fd, const enum EventType type, std::vector buffer) + : _fd(fd), _type(type), _buffer(buffer), _state(PENDING){}; + + SharedData::SharedData(const SharedData& obj) + : _fd(obj._fd), _type(obj._type), _buffer(obj._buffer), _state(obj._state){}; + + SharedData::~SharedData(){}; + + SharedData& SharedData::operator=(const SharedData& obj) { + if (this != &obj) { + const_cast(this->_fd) = obj._fd; + const_cast(this->_type) = obj._type; + this->_buffer = obj._buffer; + this->_state = obj._state; + } + return *this; + }; + +} // namespace reactor \ No newline at end of file diff --git a/src/Reactor/AEventHandler/SharedData/SharedData.h b/src/Reactor/AEventHandler/SharedData/SharedData.h new file mode 100644 index 0000000..ec4a969 --- /dev/null +++ b/src/Reactor/AEventHandler/SharedData/SharedData.h @@ -0,0 +1,9 @@ +#pragma once +#ifndef SHAREDDATA_H +#define SHAREDDATA_H + +#include "enum.h" +#include "shared_ptr.hpp" +#include "types.h" + +#endif diff --git a/src/Reactor/AEventHandler/SharedData/SharedData.hpp b/src/Reactor/AEventHandler/SharedData/SharedData.hpp new file mode 100644 index 0000000..1b1a5eb --- /dev/null +++ b/src/Reactor/AEventHandler/SharedData/SharedData.hpp @@ -0,0 +1,31 @@ +#pragma once +#ifndef SHAREDDATA_HPP +#define SHAREDDATA_HPP + +#include "SharedData.h" + +namespace reactor { + class SharedData { + private: + const fd_t _fd; + const enum EventType _type; + std::vector _buffer; + enum AsyncState _state; + + public: + SharedData(const fd_t fd, const enum EventType type, std::vector buffer); + SharedData(const SharedData& obj); + ~SharedData(); + SharedData& operator=(const SharedData& obj); + + fd_t getFd() const { return this->_fd; }; + enum EventType getType() const { return this->_type; }; + std::vector& getBuffer() { return this->_buffer; }; + enum AsyncState getState() const { return this->_state; }; + void setState(const enum AsyncState state) { this->_state = state; }; + }; + + typedef utils::shared_ptr sharedData_t; +}; // namespace reactor + +#endif diff --git a/src/Reactor/Dispatcher/Dispatcher.hpp b/src/Reactor/Dispatcher/Dispatcher.hpp index c8ba21a..663bc60 100644 --- a/src/Reactor/Dispatcher/Dispatcher.hpp +++ b/src/Reactor/Dispatcher/Dispatcher.hpp @@ -22,18 +22,18 @@ namespace reactor { ~Dispatcher(); template void registerIOHandler(sharedData_t& sharedData) { - const handle_t handle = sharedData.get()->fd; + const handle_t handle = sharedData.get()->getFd(); Factory factory; u::shared_ptr handler = factory.createIOHandler(sharedData); this->_ioHandlers[handle].push_back(handler); this->_handlerIndices[handler] = this->_ioHandlers[handle].size() - 1; - this->_demultiplexer->requestEvent(handler.get(), sharedData.get()->type); + this->_demultiplexer->requestEvent(handler.get(), sharedData.get()->getType()); } template void registerExeHandler(sharedData_t sharedData, ...) { - const handle_t handle = sharedData->fd; + const handle_t handle = sharedData->getFd(); Factory factory; va_list args; va_start(args, sharedData); diff --git a/src/ServerManager/ServerManager.cpp b/src/ServerManager/ServerManager.cpp index a89db62..6554114 100644 --- a/src/ServerManager/ServerManager.cpp +++ b/src/ServerManager/ServerManager.cpp @@ -78,5 +78,5 @@ ServerManager::~ServerManager() { void ServerManager::registerReadEvent(fd_t fd) { reactor::Dispatcher::getInstance()->registerExeHandler( - sharedData_t(new sharedData(fd, EVENT_READ, std::vector())), NULL); + reactor::sharedData_t(new reactor::SharedData(fd, EVENT_READ, std::vector())), NULL); }