Show
Ignore:
Timestamp:
01/04/12 21:46:10 (2 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1325713570 -0500
git-parent:

[c446502a4ee40c22d4500431adfafa754be78122], [3347d53135a735b1a63caebd183d91dae3088dd3]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1325713570 -0500
Message:

Merge branch 'unclump'

This merge obsoletes the initial stutter and "random"
distribution across a 60 second window and replaces it
with a metered distribution across 20ms slots in a one
minute time window.

Conflicts:

src/noit_check.c

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/noit_check_tools.c

    r278ca95 rab62dcb  
    9999  assert(check->fire_event == NULL); 
    100100  if(check->period == 0) return 0; 
    101   if(NOIT_CHECK_DISABLED(check) || NOIT_CHECK_KILLED(check)) return 0; 
     101  if(NOIT_CHECK_DISABLED(check) || NOIT_CHECK_KILLED(check)) { 
     102    if(!(check->flags & NP_TRANSIENT)) check_slots_dec_tv(last_check); 
     103    return 0; 
     104  } 
    102105 
    103106  /* If we have an event, we know when we intended it to fire.  This means