mirror of
https://github.com/sogou/workflow.git
synced 2026-10-17 04:31:07 +08:00
Merge branch 'master' of https://github.com/sogou/workflow into nossl
This commit is contained in:
@@ -1725,7 +1725,7 @@ void Communicator::unbind(CommService *service)
|
||||
}
|
||||
}
|
||||
|
||||
int Communicator::reply_idle_conn(CommSession *session, CommTarget *target)
|
||||
int Communicator::reply_reliable(CommSession *session, CommTarget *target)
|
||||
{
|
||||
struct CommConnEntry *entry;
|
||||
struct list_head *pos;
|
||||
@@ -1833,7 +1833,7 @@ int Communicator::reply(CommSession *session)
|
||||
session->passive = 2;
|
||||
target = (CommServiceTarget *)session->target;
|
||||
if (target->service->reliable)
|
||||
ret = this->reply_idle_conn(session, target);
|
||||
ret = this->reply_reliable(session, target);
|
||||
else
|
||||
ret = this->reply_unreliable(session, target);
|
||||
|
||||
@@ -1844,7 +1844,7 @@ int Communicator::reply(CommSession *session)
|
||||
if (__sync_sub_and_fetch(&entry->ref, 1) == 0)
|
||||
{
|
||||
__release_conn(entry);
|
||||
((CommServiceTarget *)target)->decref();
|
||||
target->decref();
|
||||
}
|
||||
}
|
||||
else if (ret < 0)
|
||||
|
||||
@@ -283,12 +283,11 @@ private:
|
||||
int send_message(struct CommConnEntry *entry);
|
||||
|
||||
int request_new_conn(CommSession *session, CommTarget *target);
|
||||
|
||||
int request_idle_conn(CommSession *session, CommTarget *target);
|
||||
int reply_idle_conn(CommSession *session, CommTarget *target);
|
||||
|
||||
int reply_message_unreliable(struct CommConnEntry *entry);
|
||||
|
||||
int reply_reliable(CommSession *session, CommTarget *target);
|
||||
int reply_unreliable(CommSession *session, CommTarget *target);
|
||||
|
||||
void handle_incoming_request(struct poller_result *res);
|
||||
|
||||
Reference in New Issue
Block a user