From aa85bde66fd61878b222e77c282dfd33fc116bb8 Mon Sep 17 00:00:00 2001 From: Brad Arant Date: Mon, 14 Feb 2022 07:12:19 -0800 Subject: [PATCH] Subscriptions termination fixes. --- TerminalSession.h | 26 +-- Thread.cpp | 2 +- html/CommandList_8h_source.html | 27 +-- html/Command_8h_source.html | 35 ++-- html/ConsoleServer_8h_source.html | 2 +- html/ConsoleSession_8h_source.html | 2 +- html/Object_8h_source.html | 8 +- html/SessionFilter_8h_source.html | 10 +- html/Socket_8h_source.html | 8 +- html/SubscriptionManager_8h_source.html | 111 ++++++++++++ html/Subscription_8h_source.html | 115 ++++++++++++ html/TCPServer_8h_source.html | 144 ++++++++------- html/TCPSession_8h_source.html | 24 +-- html/TCPSocket_8h_source.html | 2 +- html/TLSServer_8h_source.html | 2 +- html/TLSSession_8h_source.html | 2 +- html/TerminalSession_8h_source.html | 28 +-- html/annotated.html | 22 +-- html/classcore_1_1Command-members.html | 3 - html/classcore_1_1Command.html | 84 +-------- html/classcore_1_1CommandList-members.html | 22 ++- html/classcore_1_1CommandList.html | 28 ++- html/classcore_1_1Command__coll__graph.map | 4 - html/classcore_1_1Command__coll__graph.md5 | 1 - html/classcore_1_1Command__coll__graph.png | Bin 3446 -> 0 bytes html/classcore_1_1Command__inherit__graph.map | 15 +- html/classcore_1_1Command__inherit__graph.md5 | 2 +- html/classcore_1_1Command__inherit__graph.png | Bin 15794 -> 23869 bytes html/classcore_1_1ConsoleServer-members.html | 32 ++-- html/classcore_1_1ConsoleServer.html | 41 ++--- ...lasscore_1_1ConsoleServer__coll__graph.map | 23 +-- ...lasscore_1_1ConsoleServer__coll__graph.md5 | 2 +- ...lasscore_1_1ConsoleServer__coll__graph.png | Bin 38947 -> 47613 bytes html/classcore_1_1ConsoleSession-members.html | 6 +- html/classcore_1_1ConsoleSession.html | 27 +-- ...asscore_1_1ConsoleSession__coll__graph.map | 25 +-- ...asscore_1_1ConsoleSession__coll__graph.md5 | 2 +- ...asscore_1_1ConsoleSession__coll__graph.png | Bin 45662 -> 59188 bytes html/classcore_1_1EPoll-members.html | 17 +- html/classcore_1_1EPoll.html | 7 - html/classcore_1_1Socket-members.html | 2 +- html/classcore_1_1Socket.html | 10 +- html/classcore_1_1Subscription-members.html | 94 ++++++++++ html/classcore_1_1Subscription.html | 144 +++++++++++++++ ...sscore_1_1SubscriptionManager-members.html | 88 +++++++++ html/classcore_1_1SubscriptionManager.html | 168 ++++++++++++++++++ ...re_1_1SubscriptionManager__coll__graph.map | 4 + ...re_1_1SubscriptionManager__coll__graph.md5 | 1 + ...re_1_1SubscriptionManager__coll__graph.png | Bin 0 -> 4385 bytes ...1_1SubscriptionManager__inherit__graph.map | 4 + ...1_1SubscriptionManager__inherit__graph.md5 | 1 + ...1_1SubscriptionManager__inherit__graph.png | Bin 0 -> 4385 bytes ...classcore_1_1Subscription__coll__graph.map | 14 ++ ...classcore_1_1Subscription__coll__graph.md5 | 1 + ...classcore_1_1Subscription__coll__graph.png | Bin 0 -> 58570 bytes ...sscore_1_1Subscription__inherit__graph.map | 4 + ...sscore_1_1Subscription__inherit__graph.md5 | 1 + ...sscore_1_1Subscription__inherit__graph.png | Bin 0 -> 3701 bytes html/classcore_1_1TCPServer-members.html | 30 ++-- html/classcore_1_1TCPServer.html | 70 +++++--- html/classcore_1_1TCPServer__coll__graph.map | 19 +- html/classcore_1_1TCPServer__coll__graph.md5 | 2 +- html/classcore_1_1TCPServer__coll__graph.png | Bin 32743 -> 44020 bytes html/classcore_1_1TCPSession-members.html | 6 +- html/classcore_1_1TCPSession.html | 23 +-- html/classcore_1_1TCPSession__coll__graph.map | 21 +-- html/classcore_1_1TCPSession__coll__graph.md5 | 2 +- html/classcore_1_1TCPSession__coll__graph.png | Bin 40563 -> 55709 bytes html/classcore_1_1TCPSocket-members.html | 4 +- html/classcore_1_1TCPSocket.html | 2 +- html/classcore_1_1TLSServer-members.html | 32 ++-- html/classcore_1_1TLSServer.html | 39 ++-- html/classcore_1_1TLSServer__coll__graph.map | 21 +-- html/classcore_1_1TLSServer__coll__graph.md5 | 2 +- html/classcore_1_1TLSServer__coll__graph.png | Bin 35037 -> 44918 bytes html/classcore_1_1TLSSession-members.html | 6 +- html/classcore_1_1TLSSession.html | 25 +-- html/classcore_1_1TLSSession__coll__graph.map | 23 +-- html/classcore_1_1TLSSession__coll__graph.md5 | 2 +- html/classcore_1_1TLSSession__coll__graph.png | Bin 42907 -> 57026 bytes .../classcore_1_1TerminalSession-members.html | 6 +- html/classcore_1_1TerminalSession.html | 25 +-- ...sscore_1_1TerminalSession__coll__graph.map | 23 +-- ...sscore_1_1TerminalSession__coll__graph.md5 | 2 +- ...sscore_1_1TerminalSession__coll__graph.png | Bin 43224 -> 57933 bytes .../classcore_1_1UDPServerSocket-members.html | 29 ++- html/classcore_1_1UDPServerSocket.html | 9 +- html/classcore_1_1UDPSocket-members.html | 2 +- html/classcore_1_1UDPSocket.html | 2 +- html/classes.html | 27 +-- html/files.html | 22 +-- html/functions.html | 14 +- html/functions_func.html | 9 +- html/functions_vars.html | 5 +- html/hierarchy.html | 46 ++--- html/inherit_graph_2.map | 35 ++-- html/inherit_graph_2.md5 | 2 +- html/inherit_graph_2.png | Bin 33813 -> 40930 bytes html/inherit_graph_3.map | 3 + html/inherit_graph_3.md5 | 1 + html/inherit_graph_3.png | Bin 0 -> 1763 bytes html/inherits.html | 40 +++-- html/search/all_2.js | 17 +- html/search/all_3.js | 4 +- html/search/all_4.js | 14 +- html/search/all_5.js | 8 +- html/search/all_6.js | 2 +- html/search/all_7.js | 22 +-- html/search/all_8.js | 6 +- html/search/all_9.js | 6 +- html/search/all_a.js | 28 +-- html/search/all_b.js | 18 +- html/search/all_c.js | 6 +- html/search/all_d.js | 4 +- html/search/all_e.js | 8 +- html/search/classes_0.js | 8 +- html/search/classes_1.js | 2 +- html/search/classes_2.js | 6 +- html/search/classes_3.js | 2 +- html/search/classes_4.js | 6 +- html/search/classes_5.js | 16 +- html/search/classes_6.js | 4 +- html/search/functions_0.js | 2 +- html/search/functions_1.js | 7 +- html/search/functions_2.js | 4 +- html/search/functions_3.js | 14 +- html/search/functions_4.js | 2 +- html/search/functions_5.js | 18 +- html/search/functions_6.js | 6 +- html/search/functions_7.js | 6 +- html/search/functions_8.js | 21 ++- html/search/functions_9.js | 6 +- html/search/functions_a.js | 2 +- html/search/functions_b.js | 2 +- html/search/functions_c.js | 8 +- html/search/variables_0.js | 2 +- html/search/variables_1.js | 2 +- html/search/variables_2.js | 2 +- html/search/variables_3.js | 2 +- html/search/variables_4.js | 3 +- html/search/variables_5.js | 2 +- html/search/variables_6.html | 30 ---- html/search/variables_6.js | 4 - latex/annotated.tex | 2 + latex/classcore_1_1Command.tex | 40 +---- latex/classcore_1_1CommandList.tex | 15 +- .../classcore_1_1Command__inherit__graph.md5 | 2 +- .../classcore_1_1Command__inherit__graph.pdf | Bin 10036 -> 11145 bytes ...lasscore_1_1ConsoleServer__coll__graph.md5 | 2 +- ...lasscore_1_1ConsoleServer__coll__graph.pdf | Bin 12968 -> 13747 bytes ...asscore_1_1ConsoleSession__coll__graph.md5 | 2 +- ...asscore_1_1ConsoleSession__coll__graph.pdf | Bin 13737 -> 14631 bytes latex/classcore_1_1Socket.tex | 4 +- latex/classcore_1_1Subscription.tex | 53 ++++++ latex/classcore_1_1SubscriptionManager.tex | 62 +++++++ ...re_1_1SubscriptionManager__coll__graph.md5 | 1 + ...re_1_1SubscriptionManager__coll__graph.pdf | Bin 0 -> 7513 bytes ...1_1SubscriptionManager__inherit__graph.md5 | 1 + ...1_1SubscriptionManager__inherit__graph.pdf | Bin 0 -> 7513 bytes ...classcore_1_1Subscription__coll__graph.md5 | 1 + ...classcore_1_1Subscription__coll__graph.pdf | Bin 0 -> 14241 bytes ...sscore_1_1Subscription__inherit__graph.md5 | 1 + ...sscore_1_1Subscription__inherit__graph.pdf | Bin 0 -> 7108 bytes latex/classcore_1_1TCPServer.tex | 20 ++- latex/classcore_1_1TCPServer__coll__graph.md5 | 2 +- latex/classcore_1_1TCPServer__coll__graph.pdf | Bin 12191 -> 13187 bytes .../classcore_1_1TCPSession__coll__graph.md5 | 2 +- .../classcore_1_1TCPSession__coll__graph.pdf | Bin 12940 -> 13817 bytes latex/classcore_1_1TLSServer__coll__graph.md5 | 2 +- latex/classcore_1_1TLSServer__coll__graph.pdf | Bin 12597 -> 13581 bytes .../classcore_1_1TLSSession__coll__graph.md5 | 2 +- .../classcore_1_1TLSSession__coll__graph.pdf | Bin 13334 -> 14226 bytes ...sscore_1_1TerminalSession__coll__graph.md5 | 2 +- ...sscore_1_1TerminalSession__coll__graph.pdf | Bin 13354 -> 14241 bytes latex/hierarchy.tex | 2 + latex/refman.tex | 2 + 176 files changed, 1692 insertions(+), 938 deletions(-) create mode 100644 html/SubscriptionManager_8h_source.html create mode 100644 html/Subscription_8h_source.html delete mode 100644 html/classcore_1_1Command__coll__graph.map delete mode 100644 html/classcore_1_1Command__coll__graph.md5 delete mode 100644 html/classcore_1_1Command__coll__graph.png create mode 100644 html/classcore_1_1Subscription-members.html create mode 100644 html/classcore_1_1Subscription.html create mode 100644 html/classcore_1_1SubscriptionManager-members.html create mode 100644 html/classcore_1_1SubscriptionManager.html create mode 100644 html/classcore_1_1SubscriptionManager__coll__graph.map create mode 100644 html/classcore_1_1SubscriptionManager__coll__graph.md5 create mode 100644 html/classcore_1_1SubscriptionManager__coll__graph.png create mode 100644 html/classcore_1_1SubscriptionManager__inherit__graph.map create mode 100644 html/classcore_1_1SubscriptionManager__inherit__graph.md5 create mode 100644 html/classcore_1_1SubscriptionManager__inherit__graph.png create mode 100644 html/classcore_1_1Subscription__coll__graph.map create mode 100644 html/classcore_1_1Subscription__coll__graph.md5 create mode 100644 html/classcore_1_1Subscription__coll__graph.png create mode 100644 html/classcore_1_1Subscription__inherit__graph.map create mode 100644 html/classcore_1_1Subscription__inherit__graph.md5 create mode 100644 html/classcore_1_1Subscription__inherit__graph.png create mode 100644 html/inherit_graph_3.map create mode 100644 html/inherit_graph_3.md5 create mode 100644 html/inherit_graph_3.png delete mode 100644 html/search/variables_6.html delete mode 100644 html/search/variables_6.js create mode 100644 latex/classcore_1_1Subscription.tex create mode 100644 latex/classcore_1_1SubscriptionManager.tex create mode 100644 latex/classcore_1_1SubscriptionManager__coll__graph.md5 create mode 100644 latex/classcore_1_1SubscriptionManager__coll__graph.pdf create mode 100644 latex/classcore_1_1SubscriptionManager__inherit__graph.md5 create mode 100644 latex/classcore_1_1SubscriptionManager__inherit__graph.pdf create mode 100644 latex/classcore_1_1Subscription__coll__graph.md5 create mode 100644 latex/classcore_1_1Subscription__coll__graph.pdf create mode 100644 latex/classcore_1_1Subscription__inherit__graph.md5 create mode 100644 latex/classcore_1_1Subscription__inherit__graph.pdf diff --git a/TerminalSession.h b/TerminalSession.h index ada8b21..2bb94ea 100644 --- a/TerminalSession.h +++ b/TerminalSession.h @@ -24,44 +24,44 @@ namespace core { static const int BG_MAGENTA = 45; static const int BG_CYAN = 46; static const int BG_WHITE = 47; - + static const char esc = 0x1b; - + class TerminalSession : public TCPSession { - - public: + + public: TerminalSession(EPoll &ePoll, TCPServer &server); ~TerminalSession(); - + int getLines(); /// /// Clear the display. /// - + void clear(); - + /// /// Clear the display from the cursor to the end of line. /// - + void clearEOL(); - + /// /// Set the location of the cursor on the display. /// - + void setCursorLocation(int x, int y); void setColor(int color); void setBackColor(int color); void saveCursor(); void restoreCursor(); void NextLine(int lines); - void PreviousLine(int lines); + void PreviousLine(int lines); void scrollArea(int start, int end); - + }; - + } #endif diff --git a/Thread.cpp b/Thread.cpp index 4464439..241e2d5 100644 --- a/Thread.cpp +++ b/Thread.cpp @@ -66,5 +66,5 @@ namespace core { } coreutils::Log(coreutils::LOG_DEBUG_1) << "Thread ending with thread id " << threadId << "."; } - + } diff --git a/html/CommandList_8h_source.html b/html/CommandList_8h_source.html index cbc3b9b..0b045f8 100644 --- a/html/CommandList_8h_source.html +++ b/html/CommandList_8h_source.html @@ -79,7 +79,7 @@ $(function() {
19 
20  public:
21 
-
22  CommandList(std::string delimiter = "");
+
22  CommandList(std::string delimiter = "", int depth = 0);
23 
27 
28  void add(Command &command, std::string name = "");
@@ -102,24 +102,25 @@ $(function() {
65  protected:
66 
70 
-
71  std::vector<Command *> commands;
+
71  std::map<std::string, Command *> commands;
72  std::string delimiter;
-
73 
-
74  };
-
75 
-
76 }
-
77 
-
78 #endif
+
73  int depth;
+
74 
+
75  };
+
76 
+
77 }
+
78 
+
79 #endif
Definition: TCPSession.h:24
-
std::vector< Command * > commands
Definition: CommandList.h:71
void add(Command &command, std::string name="")
Definition: CommandList.cpp:8
-
bool processRequest(coreutils::ZString &request, TCPSession &session)
Definition: CommandList.cpp:15
-
bool grabInput(TCPSession &session, Command &command)
Definition: CommandList.cpp:27
-
void remove(Command &command)
Definition: CommandList.cpp:13
+
bool processRequest(coreutils::ZString &request, TCPSession &session)
Definition: CommandList.cpp:14
+
bool grabInput(TCPSession &session, Command &command)
Definition: CommandList.cpp:33
+
void remove(Command &command)
Definition: CommandList.cpp:12
Definition: Command.h:22
Definition: CommandList.h:18
-
int processCommand(coreutils::ZString &request, TCPSession &session)
Definition: CommandList.cpp:36
+
int processCommand(coreutils::ZString &request, TCPSession &session)
Definition: CommandList.cpp:42
+
std::map< std::string, Command * > commands
Definition: CommandList.h:71