tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

real time indexing: get rid of the rclmonpid lock file, now redundant with the general indexing lock

Browse Source
This commit is contained in:
Jean-Francois Dockes 2011-03-04 10:17:09 +01:00
parent d975ae5355
commit bf120ca881
2 changed files with 0 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/index/rclmon.h
View File

@ -78,10 +78,6 @@ extern bool startMonitor(RclConfig *conf, int flags);
/** Main routine for the event receiving thread */ /** Main routine for the event receiving thread */
extern void *rclMonRcvRun(void *); extern void *rclMonRcvRun(void *);
/** There can only be one of us. Name of the lock file inside the config
* directory. We write our pid in there */
#define RCL_MONITOR_PIDFILENAME "rclmonpid"
// Specific debug macro for monitor synchronization events // Specific debug macro for monitor synchronization events
#define MONDEB LOGDEB2 #define MONDEB LOGDEB2

70
src/index/rclmonprc.cpp
View File

@ -206,80 +206,10 @@ bool RclMonEventQueue::pushEvent(const RclMonEvent &ev)
return true; return true;
} }
static string pidfile;
/** There can only be one real time indexing process running */
static bool processlock(const string &confdir)
{
pidfile = path_cat(confdir, RCL_MONITOR_PIDFILENAME);
for (int i = 0; i < 2; i++) {
int fd = open(pidfile.c_str(), O_RDWR|O_CREAT|O_EXCL, 0644);
if (fd < 0) {
if (errno != EEXIST) {
LOGERR(("processlock: cant create %s, errno %d\n",
pidfile.c_str(), errno));
return false;
}
if ((fd = open(pidfile.c_str(), O_RDONLY)) < 0) {
LOGERR(("processlock: cant open existing %s, errno %d\n",
pidfile.c_str(), errno));
return false;
}
char buf[20];
memset(buf, 0, sizeof(buf));
if (read(fd, buf, 19) < 0) {
LOGERR(("processlock: cant read existing %s, errno %d\n",
pidfile.c_str(), errno));
close(fd);
return false;
}
close(fd);
int pid = atoi(buf);
if (pid <= 0 || (kill(pid, 0) < 0 && errno == ESRCH)) {
// File exists but no process
if (unlink(pidfile.c_str()) < 0) {
LOGERR(("processlock: cant unlink existing %s, errno %d\n",
pidfile.c_str(), errno));
return false;
}
// Let's retry
continue;
} else {
// Other process running
return false;
}
}
// File could be created, write my pid in there
char buf[20];
sprintf(buf, "%d\n", getpid());
if (write(fd, buf, strlen(buf)+1) != int(strlen(buf)+1)) {
LOGERR(("processlock: cant write to %s, errno %d\n",
pidfile.c_str(), errno));
close(fd);
return false;
}
close(fd);
// Ok
break;
}
return true;
}
static void processunlock()
{
unlink(pidfile.c_str());
}
pthread_t rcv_thrid; pthread_t rcv_thrid;
bool startMonitor(RclConfig *conf, int opts) bool startMonitor(RclConfig *conf, int opts)
{ {
if (!processlock(conf->getConfDir())) {
LOGERR(("startMonitor: lock error. Other process running ?\n"));
return false;
}
atexit(processunlock);
rclEQ.setConfig(conf); rclEQ.setConfig(conf);
rclEQ.setopts(opts); rclEQ.setopts(opts);
if (pthread_create(&rcv_thrid, 0, &rclMonRcvRun, &rclEQ) != 0) { if (pthread_create(&rcv_thrid, 0, &rclMonRcvRun, &rclEQ) != 0) {