After pull conflict resolution.
This commit is contained in:
Brad Arant committed
commit
9992a12b38
217 files changed
+15585
-296
No files matched your search
@@ -68,38 +68,44 @@ $(function() {
|
||||
<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span> <span class="preprocessor">#ifndef __SubscriptionManager_h__</span></div>
|
||||
<div class="line"><a name="l00002"></a><span class="lineno"> 2</span> <span class="preprocessor">#define __SubscriptionManager_h__</span></div>
|
||||
<div class="line"><a name="l00003"></a><span class="lineno"> 3</span>  </div>
|
||||
<div class="line"><a name="l00004"></a><span class="lineno"> 4</span> <span class="preprocessor">#include "TCPSession.h"</span></div>
|
||||
<div class="line"><a name="l00004"></a><span class="lineno"> 4</span> <span class="preprocessor">#include "Command.h"</span></div>
|
||||
<div class="line"><a name="l00005"></a><span class="lineno"> 5</span> <span class="preprocessor">#include "Subscription.h"</span></div>
|
||||
<div class="line"><a name="l00006"></a><span class="lineno"> 6</span> <span class="preprocessor">#include "Command.h"</span></div>
|
||||
<div class="line"><a name="l00007"></a><span class="lineno"> 7</span> <span class="preprocessor">#include "ZString.h"</span></div>
|
||||
<div class="line"><a name="l00008"></a><span class="lineno"> 8</span> <span class="preprocessor">#include <vector></span></div>
|
||||
<div class="line"><a name="l00006"></a><span class="lineno"> 6</span> <span class="preprocessor">#include "SubscriptionHandler.h"</span></div>
|
||||
<div class="line"><a name="l00007"></a><span class="lineno"> 7</span> <span class="preprocessor">#include "TCPSession.h"</span></div>
|
||||
<div class="line"><a name="l00008"></a><span class="lineno"> 8</span> <span class="preprocessor">#include "ZString.h"</span></div>
|
||||
<div class="line"><a name="l00009"></a><span class="lineno"> 9</span> <span class="preprocessor">#include <string></span></div>
|
||||
<div class="line"><a name="l00010"></a><span class="lineno"> 10</span>  </div>
|
||||
<div class="line"><a name="l00011"></a><span class="lineno"> 11</span> <span class="keyword">namespace </span>core {</div>
|
||||
<div class="line"><a name="l00012"></a><span class="lineno"> 12</span>  </div>
|
||||
<div class="line"><a name="l00013"></a><span class="lineno"><a class="line" href="classcore_1_1SubscriptionManager.html"> 13</a></span>  <span class="keyword">class </span><a class="code" href="classcore_1_1SubscriptionManager.html">SubscriptionManager</a> : <span class="keyword">public</span> <a class="code" href="classcore_1_1Command.html">Command</a> {</div>
|
||||
<div class="line"><a name="l00014"></a><span class="lineno"> 14</span>  </div>
|
||||
<div class="line"><a name="l00015"></a><span class="lineno"> 15</span>  <span class="keyword">public</span>:</div>
|
||||
<div class="line"><a name="l00016"></a><span class="lineno"> 16</span>  <a class="code" href="classcore_1_1SubscriptionManager.html">SubscriptionManager</a>();</div>
|
||||
<div class="line"><a name="l00017"></a><span class="lineno"> 17</span>  </div>
|
||||
<div class="line"><a name="l00018"></a><span class="lineno"> 18</span>  <span class="keywordtype">int</span> add(<a class="code" href="classcore_1_1Subscription.html">Subscription</a> &subscription);</div>
|
||||
<div class="line"><a name="l00019"></a><span class="lineno"> 19</span>  </div>
|
||||
<div class="line"><a name="l00020"></a><span class="lineno"> 20</span>  <span class="keywordtype">int</span> removeSessionSubscriptions(<a class="code" href="classcore_1_1TCPSession.html">TCPSession</a> &session);</div>
|
||||
<div class="line"><a name="l00021"></a><span class="lineno"> 21</span>  </div>
|
||||
<div class="line"><a name="l00022"></a><span class="lineno"> 22</span>  <span class="keywordtype">int</span> <a class="code" href="classcore_1_1SubscriptionManager.html#aaa30bf772ad72b3f319a790662e4f8ae">processCommand</a>(coreutils::ZString &request, <a class="code" href="classcore_1_1TCPSession.html">TCPSession</a> &session) <span class="keyword">override</span>;</div>
|
||||
<div class="line"><a name="l00023"></a><span class="lineno"> 23</span>  </div>
|
||||
<div class="line"><a name="l00024"></a><span class="lineno"> 24</span>  <span class="keyword">private</span>:</div>
|
||||
<div class="line"><a name="l00025"></a><span class="lineno"> 25</span>  std::map<std::string, Subscription *> subscriptions;</div>
|
||||
<div class="line"><a name="l00026"></a><span class="lineno"> 26</span>  std::mutex lock;</div>
|
||||
<div class="line"><a name="l00027"></a><span class="lineno"> 27</span>  </div>
|
||||
<div class="line"><a name="l00028"></a><span class="lineno"> 28</span>  };</div>
|
||||
<div class="line"><a name="l00029"></a><span class="lineno"> 29</span> }</div>
|
||||
<div class="line"><a name="l00030"></a><span class="lineno"> 30</span>  </div>
|
||||
<div class="line"><a name="l00031"></a><span class="lineno"> 31</span> <span class="preprocessor">#endif</span></div>
|
||||
<div class="line"><a name="l00010"></a><span class="lineno"> 10</span> <span class="preprocessor">#include <vector></span></div>
|
||||
<div class="line"><a name="l00011"></a><span class="lineno"> 11</span>  </div>
|
||||
<div class="line"><a name="l00012"></a><span class="lineno"> 12</span> <span class="keyword">namespace </span>core {</div>
|
||||
<div class="line"><a name="l00013"></a><span class="lineno"> 13</span>  </div>
|
||||
<div class="line"><a name="l00014"></a><span class="lineno"><a class="line" href="classcore_1_1SubscriptionManager.html"> 14</a></span>  <span class="keyword">class </span><a class="code" href="classcore_1_1SubscriptionManager.html">SubscriptionManager</a> : <span class="keyword">public</span> <a class="code" href="classcore_1_1Command.html">Command</a> {</div>
|
||||
<div class="line"><a name="l00015"></a><span class="lineno"> 15</span>  </div>
|
||||
<div class="line"><a name="l00016"></a><span class="lineno"> 16</span>  <span class="keyword">public</span>:</div>
|
||||
<div class="line"><a name="l00017"></a><span class="lineno"> 17</span>  <a class="code" href="classcore_1_1SubscriptionManager.html">SubscriptionManager</a>();</div>
|
||||
<div class="line"><a name="l00018"></a><span class="lineno"> 18</span>  </div>
|
||||
<div class="line"><a name="l00019"></a><span class="lineno"> 19</span>  <span class="keywordtype">int</span> add(<a class="code" href="classcore_1_1Subscription.html">Subscription</a> &subscription);</div>
|
||||
<div class="line"><a name="l00020"></a><span class="lineno"> 20</span>  <span class="keywordtype">int</span> addHandler(std::string name, <a class="code" href="classcore_1_1SubscriptionHandler.html">SubscriptionHandler</a> *handler);</div>
|
||||
<div class="line"><a name="l00021"></a><span class="lineno"> 21</span>  </div>
|
||||
<div class="line"><a name="l00022"></a><span class="lineno"> 22</span>  <span class="keywordtype">int</span> removeSessionSubscriptions(<a class="code" href="classcore_1_1TCPSession.html">TCPSession</a> &session);</div>
|
||||
<div class="line"><a name="l00023"></a><span class="lineno"> 23</span>  </div>
|
||||
<div class="line"><a name="l00024"></a><span class="lineno"> 24</span>  <span class="keywordtype">int</span> <a class="code" href="classcore_1_1SubscriptionManager.html#aaa30bf772ad72b3f319a790662e4f8ae">processCommand</a>(coreutils::ZString &request, <a class="code" href="classcore_1_1TCPSession.html">TCPSession</a> &session) <span class="keyword">override</span>;</div>
|
||||
<div class="line"><a name="l00025"></a><span class="lineno"> 25</span>  </div>
|
||||
<div class="line"><a name="l00026"></a><span class="lineno"> 26</span>  <span class="keyword">private</span>:</div>
|
||||
<div class="line"><a name="l00027"></a><span class="lineno"> 27</span>  <a class="code" href="classcore_1_1Subscription.html">Subscription</a> *subscription;</div>
|
||||
<div class="line"><a name="l00028"></a><span class="lineno"> 28</span>  std::map<std::string, Subscription *> subscriptions;</div>
|
||||
<div class="line"><a name="l00029"></a><span class="lineno"> 29</span>  std::map<std::string, SubscriptionHandler *> handlers;</div>
|
||||
<div class="line"><a name="l00030"></a><span class="lineno"> 30</span>  <a class="code" href="classcore_1_1Subscription.html">Subscription</a> *newSubscription;</div>
|
||||
<div class="line"><a name="l00031"></a><span class="lineno"> 31</span>  std::mutex lock;</div>
|
||||
<div class="line"><a name="l00032"></a><span class="lineno"> 32</span>  };</div>
|
||||
<div class="line"><a name="l00033"></a><span class="lineno"> 33</span>  </div>
|
||||
<div class="line"><a name="l00034"></a><span class="lineno"> 34</span> }</div>
|
||||
<div class="line"><a name="l00035"></a><span class="lineno"> 35</span>  </div>
|
||||
<div class="line"><a name="l00036"></a><span class="lineno"> 36</span> <span class="preprocessor">#endif</span></div>
|
||||
<div class="ttc" id="aclasscore_1_1Command_html"><div class="ttname"><a href="classcore_1_1Command.html">core::Command</a></div><div class="ttdef"><b>Definition:</b> Command.h:22</div></div>
|
||||
<div class="ttc" id="aclasscore_1_1SubscriptionManager_html"><div class="ttname"><a href="classcore_1_1SubscriptionManager.html">core::SubscriptionManager</a></div><div class="ttdef"><b>Definition:</b> SubscriptionManager.h:13</div></div>
|
||||
<div class="ttc" id="aclasscore_1_1SubscriptionManager_html_aaa30bf772ad72b3f319a790662e4f8ae"><div class="ttname"><a href="classcore_1_1SubscriptionManager.html#aaa30bf772ad72b3f319a790662e4f8ae">core::SubscriptionManager::processCommand</a></div><div class="ttdeci">int processCommand(coreutils::ZString &request, TCPSession &session) override</div><div class="ttdef"><b>Definition:</b> SubscriptionManager.cpp:44</div></div>
|
||||
<div class="ttc" id="aclasscore_1_1Subscription_html"><div class="ttname"><a href="classcore_1_1Subscription.html">core::Subscription</a></div><div class="ttdef"><b>Definition:</b> Subscription.h:14</div></div>
|
||||
<div class="ttc" id="aclasscore_1_1SubscriptionHandler_html"><div class="ttname"><a href="classcore_1_1SubscriptionHandler.html">core::SubscriptionHandler</a></div><div class="ttdef"><b>Definition:</b> SubscriptionHandler.h:15</div></div>
|
||||
<div class="ttc" id="aclasscore_1_1SubscriptionManager_html"><div class="ttname"><a href="classcore_1_1SubscriptionManager.html">core::SubscriptionManager</a></div><div class="ttdef"><b>Definition:</b> SubscriptionManager.h:14</div></div>
|
||||
<div class="ttc" id="aclasscore_1_1SubscriptionManager_html_aaa30bf772ad72b3f319a790662e4f8ae"><div class="ttname"><a href="classcore_1_1SubscriptionManager.html#aaa30bf772ad72b3f319a790662e4f8ae">core::SubscriptionManager::processCommand</a></div><div class="ttdeci">int processCommand(coreutils::ZString &request, TCPSession &session) override</div><div class="ttdef"><b>Definition:</b> SubscriptionManager.cpp:59</div></div>
|
||||
<div class="ttc" id="aclasscore_1_1Subscription_html"><div class="ttname"><a href="classcore_1_1Subscription.html">core::Subscription</a></div><div class="ttdef"><b>Definition:</b> Subscription.h:15</div></div>
|
||||
<div class="ttc" id="aclasscore_1_1TCPSession_html"><div class="ttname"><a href="classcore_1_1TCPSession.html">core::TCPSession</a></div><div class="ttdef"><b>Definition:</b> TCPSession.h:24</div></div>
|
||||
</div><!-- fragment --></div><!-- contents -->
|
||||
<!-- start footer part -->
|
||||
|
||||
Reference in new issue
Block a user