X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=5c51beed1e0d32d85a3d1332df28bfff19f964e9;hp=eae66255f2bb07d9f3d7afaeee44e988be5bc548;hb=36dddd1ca40b4abbe3352b4cb93b465f4038666e;hpb=239cc98b80b614be2c7079c153c6a1dc2cdaa7e8

diff --git a/udevd.c b/udevd.c
index eae66255f..5c51beed1 100644
--- a/udevd.c
+++ b/udevd.c
@@ -118,7 +118,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg)
 	if (udev == NULL)
 		return -1;
 	strlcpy(udev->action, msg->action, sizeof(udev->action));
-	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem);
+	sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver);
 	udev->devt = msg->devt;
 
 	retval = udev_device_event(&rules, udev);
@@ -310,7 +310,68 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 	run_exec_q = 1;
 }
 
-/* runs event and removes event from run queue when finished */
+static int mem_size_mb(void)
+{
+	int f;
+	char buf[8192];
+	long int len;
+	const char *pos;
+	long int memsize;
+
+	f = open("/proc/meminfo", O_RDONLY);
+	if (f == -1)
+		return -1;
+
+	len = read(f, buf, sizeof(buf)-1);
+	close(f);
+
+	if (len <= 0)
+		return -1;
+	buf[len] = '\0';
+
+	pos = strstr(buf, "MemTotal: ");
+	if (pos == NULL)
+		return -1;
+
+	if (sscanf(pos, "MemTotal: %ld kB", &memsize) != 1)
+		return -1;
+
+	return memsize / 1024;
+}
+
+static int cpu_count(void)
+{
+	int f;
+	char buf[32768];
+	int len;
+	const char *pos;
+	int count = 0;
+
+	f = open("/proc/stat", O_RDONLY);
+	if (f == -1)
+		return -1;
+
+	len = read(f, buf, sizeof(buf)-1);
+	close(f);
+	if (len <= 0)
+		return -1;
+	buf[len] = '\0';
+
+	pos = strstr(buf, "cpu");
+	if (pos == NULL)
+		return -1;
+
+	while (pos != NULL) {
+		if (strncmp(pos, "cpu", 3) == 0 &&isdigit(pos[3]))
+			count++;
+		pos = strstr(&pos[3], "cpu");
+	}
+
+	if (count == 0)
+		return -1;
+	return count;
+}
+
 static int running_processes(void)
 {
 	int f;
@@ -325,11 +386,9 @@ static int running_processes(void)
 
 	len = read(f, buf, sizeof(buf)-1);
 	close(f);
-
 	if (len <= 0)
 		return -1;
-	else
-		buf[len] = '\0';
+	buf[len] = '\0';
 
 	pos = strstr(buf, "procs_running ");
 	if (pos == NULL)
@@ -534,6 +593,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz
 			msg->devpath = &key[8];
 		else if (strncmp(key, "SUBSYSTEM=", 10) == 0)
 			msg->subsystem = &key[10];
+		else if (strncmp(key, "DRIVER=", 7) == 0)
+			msg->driver = &key[7];
 		else if (strncmp(key, "SEQNUM=", 7) == 0)
 			msg->seqnum = strtoull(&key[7], NULL, 10);
 		else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
@@ -625,12 +686,17 @@ static void get_ctrl_msg(void)
 		info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval);
 		max_childs = *intval;
 		break;
+	case UDEVD_CTRL_SET_MAX_CHILDS_RUNNING:
+		intval = (int *) ctrl_msg.buf;
+		info("udevd message (UDEVD_SET_MAX_CHILDS_RUNNING) received, max_childs=%i", *intval);
+		max_childs_running = *intval;
+		break;
 	case UDEVD_CTRL_RELOAD_RULES:
 		info("udevd message (RELOAD_RULES) received");
 		reload_config = 1;
 		break;
 	default:
-		dbg("unknown message type");
+		err("unknown control message type");
 	}
 }
 
@@ -746,7 +812,6 @@ static void reap_sigchilds(void)
 static int init_udevd_socket(void)
 {
 	struct sockaddr_un saddr;
-	const int buffersize = 16 * 1024 * 1024;
 	socklen_t addrlen;
 	const int feature_on = 1;
 	int retval;
@@ -763,9 +828,6 @@ static int init_udevd_socket(void)
 		return -1;
 	}
 
-	/* set receive buffersize */
-	setsockopt(udevd_sock, SOL_SOCKET, SO_RCVBUFFORCE, &buffersize, sizeof(buffersize));
-
 	/* the bind takes care of ensuring only one copy running */
 	retval = bind(udevd_sock, (struct sockaddr *) &saddr, addrlen);
 	if (retval < 0) {
@@ -883,10 +945,6 @@ int main(int argc, char *argv[], char *envp[])
 			info("will daemonize");
 			daemonize = 1;
 		}
-		if (strcmp(arg, "--stop-exec-queue") == 0) {
-			info("will not execute events until START_EXEC_QUEUE is received");
-			stop_exec_q = 1;
-		}
 	}
 
 	/* init sockets to receive events */
@@ -1002,16 +1060,26 @@ int main(int argc, char *argv[], char *envp[])
 	value = getenv("UDEVD_MAX_CHILDS");
 	if (value)
 		max_childs = strtoul(value, NULL, 10);
-	else
-		max_childs = UDEVD_MAX_CHILDS;
+	else {
+		int memsize = mem_size_mb();
+		if (memsize > 0)
+			max_childs = 128 + (memsize / 4);
+		else
+			max_childs = UDEVD_MAX_CHILDS;
+	}
 	info("initialize max_childs to %u", max_childs);
 
 	/* start to throttle forking if maximum number of _running_ childs is reached */
 	value = getenv("UDEVD_MAX_CHILDS_RUNNING");
 	if (value)
 		max_childs_running = strtoull(value, NULL, 10);
-	else
-		max_childs_running = UDEVD_MAX_CHILDS_RUNNING;
+	else {
+		int cpus = cpu_count();
+		if (cpus > 0)
+			max_childs_running = 8 + (8 * cpus);
+		else
+			max_childs_running = UDEVD_MAX_CHILDS_RUNNING;
+	}
 	info("initialize max_childs_running to %u", max_childs_running);
 
 	/* clear environment for forked event processes */