X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-ctrl.c;h=25661cade91308b871b64976853c518e25f93d97;hb=4061ab9f4bb0bdad3858e8ef1738dc892afe9de4;hp=848f5078783db4a2a4080df73b7eb08083c9d3b0;hpb=b692a750899453e45faa07c057020a22594eb521;p=elogind.git

diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index 848f50787..25661cade 100644
--- a/udev/lib/libudev-ctrl.c
+++ b/udev/lib/libudev-ctrl.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <errno.h>
@@ -42,6 +34,7 @@ enum udev_ctrl_msg_type {
 	UDEV_CTRL_SET_ENV,
 	UDEV_CTRL_SET_MAX_CHILDS,
 	UDEV_CTRL_SET_MAX_CHILDS_RUNNING,
+	UDEV_CTRL_SETTLE,
 };
 
 struct udev_ctrl_msg_wire {
@@ -58,6 +51,7 @@ struct udev_ctrl_msg {
 	int refcount;
 	struct udev_ctrl *uctrl;
 	struct udev_ctrl_msg_wire ctrl_msg_wire;
+	pid_t pid;
 };
 
 struct udev_ctrl {
@@ -72,10 +66,9 @@ struct udev_ctrl *udev_ctrl_new_from_socket(struct udev *udev, const char *socke
 {
 	struct udev_ctrl *uctrl;
 
-	uctrl = malloc(sizeof(struct udev_ctrl));
+	uctrl = calloc(1, sizeof(struct udev_ctrl));
 	if (uctrl == NULL)
 		return NULL;
-	memset(uctrl, 0x00, sizeof(struct udev_ctrl));
 	uctrl->refcount = 1;
 	uctrl->udev = udev;
 
@@ -169,38 +162,37 @@ static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int
 
 int udev_ctrl_send_set_log_level(struct udev_ctrl *uctrl, int priority)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL);
 }
 
 int udev_ctrl_send_stop_exec_queue(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL);
 }
 
 int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL);
 }
 
 int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL);
 }
 
 int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key);
 }
 
 int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL);
+}
+
+int udev_ctrl_send_settle(struct udev_ctrl *uctrl)
+{
+	return ctrl_send(uctrl, UDEV_CTRL_SETTLE, 0, NULL);
 }
 
 struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
@@ -213,10 +205,9 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
 	struct ucred *cred;
 	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
 
-	uctrl_msg = malloc(sizeof(struct udev_ctrl_msg));
+	uctrl_msg = calloc(1, sizeof(struct udev_ctrl_msg));
 	if (uctrl_msg == NULL)
 		return NULL;
-	memset(uctrl_msg, 0x00, sizeof(struct udev_ctrl_msg));
 	uctrl_msg->refcount = 1;
 	uctrl_msg->uctrl = uctrl;
 
@@ -247,12 +238,14 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)
 		goto err;
 	}
 
+	uctrl_msg->pid = cred->pid;
+
 	if (uctrl_msg->ctrl_msg_wire.magic != UDEV_CTRL_MAGIC) {
 		err(uctrl->udev, "message magic 0x%08x doesn't match, ignore it\n", uctrl_msg->ctrl_msg_wire.magic);
 		goto err;
 	}
 
-	info(uctrl->udev, "created ctrl_msg %p (%i)\n", uctrl_msg, uctrl_msg->ctrl_msg_wire.type);
+	dbg(uctrl->udev, "created ctrl_msg %p (%i)\n", uctrl_msg, uctrl_msg->ctrl_msg_wire.type);
 	return uctrl_msg;
 err:
 	udev_ctrl_msg_unref(uctrl_msg);
@@ -274,7 +267,7 @@ void udev_ctrl_msg_unref(struct udev_ctrl_msg *ctrl_msg)
 	ctrl_msg->refcount--;
 	if (ctrl_msg->refcount > 0)
 		return;
-	info(ctrl_msg->uctrl->udev, "release ctrl_msg %p\n", ctrl_msg);
+	dbg(ctrl_msg->uctrl->udev, "release ctrl_msg %p\n", ctrl_msg);
 	free(ctrl_msg);
 }
 
@@ -319,3 +312,10 @@ int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg)
 		return ctrl_msg->ctrl_msg_wire.intval;
 	return -1;
 }
+
+pid_t udev_ctrl_get_settle(struct udev_ctrl_msg *ctrl_msg)
+{
+	if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SETTLE)
+		return ctrl_msg->pid;
+	return -1;
+}