/** The filename to use for the hash cache (see the FILES section
* for more information). */
{CONF_VAR_STRING, "hashcache", {.str = L"dc-hashcache"}},
+ /** Writes of the hash cache and file lists are delayed for an
+ * amount of time, in order to minimize the time spent on I/O wait
+ * while hashing many small files. This variable sets the amount
+ * of time, in seconds. */
+ {CONF_VAR_INT, "hashwritedelay", {.num = 300}},
+ /** The amount of time, in seconds, to wait before automatically
+ * rescanning the shared directories for changes. Set to zero (the
+ * default) to disable automatic rescanning. (Broken shares are
+ * always rescanned upon detection, regardless of this
+ * setting.) */
+ {CONF_VAR_INT, "rescandelay", {.num = 0}},
{CONF_VAR_END}
};
* job. */
static pid_t hashjob = -1;
struct sharecache *shareroot = NULL;
+static struct timer *scantimer = NULL;
unsigned long long sharesize = 0;
GCBCHAIN(sharechangecb, unsigned long long);
if(!now)
{
if(hashwritetimer == NULL)
- hashwritetimer = timercallback(ntime() + 300, (void (*)(int, void *))hashtimercb, NULL);
+ hashwritetimer = timercallback(ntime() + confgetint("cli", "hashwritedelay"), (void (*)(int, void *))hashtimercb, NULL);
return;
}
if(hashwritetimer != NULL)
return(1);
}
+static void rescancb(int cancelled, void *uudata)
+{
+ scantimer = NULL;
+ if(!cancelled)
+ {
+ if(scanqueue == NULL)
+ scanshares();
+ else if(confgetint("cli", "rescandelay") > 0)
+ scantimer = timercallback(ntime() + confgetint("cli", "rescandelay"), (void (*)(int, void *))rescancb, NULL);
+ }
+}
+
void scanshares(void)
{
struct sharepoint *cur;
}
queuescan(node);
}
+ if(scantimer != NULL)
+ canceltimer(scantimer);
+ if(confgetint("cli", "rescandelay") > 0)
+ scantimer = timercallback(ntime() + confgetint("cli", "rescandelay"), (void (*)(int, void *))rescancb, NULL);
}
static void preinit(int hup)
}
}
+static int rsdelayupdate(struct configvar *var, void *uudata)
+{
+ if(scantimer != NULL)
+ canceltimer(scantimer);
+ if(confgetint("cli", "rescandelay") > 0)
+ scantimer = timercallback(ntime() + var->val.num, (void (*)(int, void *))rescancb, NULL);
+ return(0);
+}
+
static int init(int hup)
{
struct sharepoint *cur, *next;
}
scanshares();
if(!hup)
+ {
while(doscan(100));
+ CBREG(confgetvar("cli", "rescandelay"), conf_update, rsdelayupdate, NULL, NULL);
+ }
return(0);
}