From b34b51e8c1e82d7bb3b5e3b5e72afc51beda37ab Mon Sep 17 00:00:00 2001 From: quininer Date: Mon, 21 Dec 2015 18:13:03 +0800 Subject: [PATCH 1/3] use tox_iteration_interval --- src/toxic.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/toxic.c b/src/toxic.c index 4eb4b93..c53d094 100644 --- a/src/toxic.c +++ b/src/toxic.c @@ -1177,25 +1177,6 @@ static void init_default_data_files(void) free(user_config_dir); } -#define REC_TOX_DO_LOOPS_PER_SEC 25 - -/* Adjusts usleep value so that tox_do runs close to the recommended number of times per second */ -static useconds_t optimal_msleepval(uint64_t *looptimer, uint64_t *loopcount, uint64_t cur_time, useconds_t msleepval) -{ - useconds_t new_sleep = MAX(msleepval, 3); - ++(*loopcount); - - if (*looptimer == cur_time) - return new_sleep; - - if (*loopcount != REC_TOX_DO_LOOPS_PER_SEC) - new_sleep *= (double) *loopcount / REC_TOX_DO_LOOPS_PER_SEC; - - *looptimer = cur_time; - *loopcount = 0; - return new_sleep; -} - // this doesn't do anything (yet) #ifdef X11 void DnD_callback(const char* asdv, DropType dt) @@ -1345,7 +1326,7 @@ int main(int argc, char **argv) last_save = cur_time; } - msleepval = optimal_msleepval(&looptimer, &loopcount, cur_time, msleepval); + msleepval = tox_iteration_interval(m); usleep(msleepval); } From 4419be36e8ec7b0e7a107b8b7248afe8d53f2158 Mon Sep 17 00:00:00 2001 From: quininer Date: Mon, 21 Dec 2015 20:00:48 +0800 Subject: [PATCH 2/3] remove useless var --- src/toxic.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/toxic.c b/src/toxic.c index c53d094..31e0014 100644 --- a/src/toxic.c +++ b/src/toxic.c @@ -1308,9 +1308,6 @@ int main(int argc, char **argv) execute(prompt->chatwin->history, prompt, m, avatarstr, GLOBAL_COMMAND_MODE); uint64_t last_save = (uint64_t) time(NULL); - uint64_t looptimer = last_save; - useconds_t msleepval = 40000; - uint64_t loopcount = 0; while (true) { do_toxic(m, prompt); @@ -1326,8 +1323,7 @@ int main(int argc, char **argv) last_save = cur_time; } - msleepval = tox_iteration_interval(m); - usleep(msleepval); + usleep(tox_iteration_interval(m)); } return 0; From deccaec40e6c376cf96fb3e0d00d67f63c5f2431 Mon Sep 17 00:00:00 2001 From: quininer Date: Tue, 22 Dec 2015 10:43:08 +0800 Subject: [PATCH 3/3] fix milliseconds --- src/toxic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/toxic.c b/src/toxic.c index 31e0014..31765a0 100644 --- a/src/toxic.c +++ b/src/toxic.c @@ -1323,7 +1323,7 @@ int main(int argc, char **argv) last_save = cur_time; } - usleep(tox_iteration_interval(m)); + usleep(tox_iteration_interval(m) * 1000); } return 0;