Commit f4e053d6 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'bug4518' into maint-0.2.2

parents b3c988f0 8e388bc3

changes/bug4518

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (performance):

    - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers

      function. This was eating up hideously large amounts of time on some

      busy servers. Fixes bug 4518.

src/or/cpuworker.c

+12 −2
Original line number Diff line number Diff line
@@ -446,9 +446,19 @@ assign_onionskin_to_cpuworker(connection_t *cpuworker, 
{

  char qbuf[1];

  char tag[TAG_LEN];

  time_t now = approx_time();

  static time_t last_culled_cpuworkers = 0;



  /* Checking for wedged cpuworkers requires a linear search over all

   * connections, so let's do it only once a minute.

   */

#define CULL_CPUWORKERS_INTERVAL 60



  if (last_culled_cpuworkers + CULL_CPUWORKERS_INTERVAL <= now) {

    cull_wedged_cpuworkers();

    spawn_enough_cpuworkers();

    last_culled_cpuworkers = now;

  }



  if (1) {

    if (num_cpuworkers_busy == num_cpuworkers) {