mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-03-05 08:50:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for cwmp doing 90% cpu load

Browse source
This commit is contained in:
Strhuan Blomquist 2014-05-23 16:58:39 +02:00
parent cf7a5dd994
commit b15a2fbafb
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
xml.c
View file

@ -1700,16 +1700,21 @@ void *thread_cwmp_rpc_cpe_scheduleInform (void *v)
add_event_same_time = true;
continue;
}
} else {
stime = time(NULL) - 10;
}
bkp_session_save();
add_event_same_time = false;
pthread_mutex_lock (&mutex_schedule_inform);
si_timeout.tv_sec = stime;
pthread_cond_timedwait(&threshold_schedule_inform, &mutex_schedule_inform, &si_timeout);
pthread_mutex_unlock (&mutex_schedule_inform);
}
} else {
bkp_session_save();
add_event_same_time = false;
pthread_mutex_lock (&mutex_schedule_inform);
pthread_cond_wait(&threshold_schedule_inform, &mutex_schedule_inform);
pthread_mutex_unlock (&mutex_schedule_inform);
}
}
return NULL;
}
@ -1789,7 +1794,6 @@ int cwmp_handle_rpc_cpe_schedule_inform(struct session *session, struct rpc *rpc
schedule_inform = list_entry(ilist,struct schedule_inform, list);
if (schedule_inform->scheduled_time >= scheduled_time)
{
cond_signal = true;
break;
}
}
@ -1815,10 +1819,7 @@ int cwmp_handle_rpc_cpe_schedule_inform(struct session *session, struct rpc *rpc
bkp_session_insert_schedule_inform(schedule_inform->scheduled_time,schedule_inform->commandKey);
bkp_session_save();
pthread_mutex_unlock (&mutex_schedule_inform);
if (cond_signal)
{
pthread_cond_signal(&threshold_schedule_inform);
}
success:
return 0;
@ -2008,13 +2009,15 @@ void *thread_cwmp_rpc_cpe_download (void *v)
pthread_mutex_unlock (&mutex_download);
continue;
}
} else {
stime = time(NULL) - 10;
}
pthread_mutex_lock (&mutex_download);
download_timeout.tv_sec = stime;
pthread_cond_timedwait(&threshold_download, &mutex_download, &download_timeout);
pthread_mutex_unlock (&mutex_download);
} else {
pthread_mutex_lock (&mutex_download);
pthread_cond_wait(&threshold_download, &mutex_download);
pthread_mutex_unlock (&mutex_download);
}
}
return NULL;
}
@ -2225,7 +2228,6 @@ int cwmp_handle_rpc_cpe_download(struct session *session, struct rpc *rpc)
idownload = list_entry(ilist,struct download, list);
if (idownload->scheduled_time >= scheduled_time)
{
cond_signal = true;
break;
}
}
@ -2247,10 +2249,7 @@ int cwmp_handle_rpc_cpe_download(struct session *session, struct rpc *rpc)
}
pthread_mutex_unlock (&mutex_download);
if (cond_signal)
{
pthread_cond_signal(&threshold_download);
}
}
return 0;