Compare commits

..

No commits in common. "848077797b9de6cbb47abad14a472cce78896d41" and "5495455fa7c75959e6b7f3beb8ead56fb204b7c1" have entirely different histories.

2 changed files with 3 additions and 6 deletions

View File

@ -2,7 +2,7 @@
%define CommitVersion %(echo $COMMIT_VERSION)
Name: libserverframe
Version: 1.2.11
Version: 1.2.10
Release: 1%{?dist}
Summary: network framework library
License: AGPL v3.0
@ -12,9 +12,9 @@ Source: http://github.com/happyfish100/libserverframe/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libfastcommon-devel >= 1.0.83
BuildRequires: libfastcommon-devel >= 1.0.82
Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
Requires: libfastcommon >= 1.0.83
Requires: libfastcommon >= 1.0.82
%description
common framework library

View File

@ -544,7 +544,6 @@ int sf_nio_notify(struct fast_task_info *task, const int stage)
}
}
sf_hold_task(task); //since 1.2.11
PTHREAD_MUTEX_LOCK(&task->thread_data->waiting_queue.lock);
task->notify_next = NULL;
if (task->thread_data->waiting_queue.tail == NULL) {
@ -634,7 +633,6 @@ void sf_recv_notify_read(int fd, const int event, void *arg)
__sync_bool_compare_and_swap(&task->nio_stages.notify,
stage, SF_NIO_STAGE_NONE);
}
sf_release_task(task); //since 1.2.11
}
}
@ -1301,7 +1299,6 @@ static int sock_write_done(struct fast_task_info *task,
if (SF_CTX->callbacks.send_done(task,
length, &next_stage) != 0)
{
ioevent_add_to_deleted_list(task);
return -1;
}