Merge branch 'master' of https://github.com/sogou/workflow into nossl

This commit is contained in:
Xie Han
2024-03-31 01:05:25 +08:00
2 changed files with 4 additions and 5 deletions
+3 -3
View File
@@ -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)
+1 -2
View File
@@ -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);