koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use gettimeofday() and struct timevals instead of time()

Browse Source 
Initially I thought using the second precision time() function is good enough,
but to make t/113-urgent.t considerably faster (>2s vs. 0.08s), we put in a
little more effort and use gettimeofday. Otherwise, this test blocks the whole
testsuite from completing much faster on modern machines :).
This commit is contained in:
Michael Stapelberg
2012-02-21 13:38:49 +01:00
parent 1ab3621656
commit ab9ba6fcf9
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/match.c
View File

@ -13,6 +13,12 @@
*/
#include "all.h"
/* From sys/time.h, not sure if it’s available on all systems. */
# define _i3_timercmp(a, b, CMP) \
(((a).tv_sec == (b).tv_sec) ? \
((a).tv_usec CMP (b).tv_usec) : \
((a).tv_sec CMP (b).tv_sec))
/*
* Initializes the Match data structure. This function is necessary because the
* members representing boolean values (like dock) need to be initialized with
@ -125,13 +131,13 @@ bool match_matches_window(Match *match, i3Window *window) {
Con *con = NULL;
if (match->urgent == U_LATEST) {
/* if the window isn't urgent, no sense in searching */
if (window->urgent == 0) {
if (window->urgent.tv_sec == 0) {
return false;
}
/* if we find a window that is newer than this one, bail */
TAILQ_FOREACH(con, &all_cons, all_cons) {
if ((con->window != NULL) &&
(con->window->urgent > window->urgent)) {
_i3_timercmp(con->window->urgent, window->urgent, >)) {
return false;
}
}
@ -140,14 +146,14 @@ bool match_matches_window(Match *match, i3Window *window) {
if (match->urgent == U_OLDEST) {
/* if the window isn't urgent, no sense in searching */
if (window->urgent == 0) {
if (window->urgent.tv_sec == 0) {
return false;
}
/* if we find a window that is older than this one (and not 0), bail */
TAILQ_FOREACH(con, &all_cons, all_cons) {
if ((con->window != NULL) &&
(con->window->urgent != 0) &&
(con->window->urgent < window->urgent)) {
(con->window->urgent.tv_sec != 0) &&
_i3_timercmp(con->window->urgent, window->urgent, <)) {
return false;
}
}