Merge pull request #28 from gao-feng/cleanup

Cleanup

Author: laijs

src/container.c

@@ -16,6 +16,7 @@
 
 #include "util.h"
 #include "hyper.h"
+#include "parse.h"
 
 static int container_setup_volume(struct hyper_container *container)
 {
@@ -571,99 +572,39 @@ int hyper_start_container(struct hyper_container *container,
 
 struct hyper_container *hyper_find_container(struct hyper_pod *pod, char *id)
 {
-	int i;
-	struct hyper_container *container;
-
-	for (i = 0; i < pod->c_num; i++) {
-		container = &pod->c[i];
-
-		if (strlen(container->id) != strlen(id))
-			continue;
-
-		if (strncmp(container->id, id, strlen(id)))
-			continue;
+	struct hyper_container *c;
 
-		return container;
-	}
-
-	list_for_each_entry(container, &pod->dyn_containers, dyn) {
-		if (strlen(container->id) != strlen(id))
+	list_for_each_entry(c, &pod->containers, list) {
+		if (strlen(c->id) != strlen(id))
 			continue;
 
-		if (strncmp(container->id, id, strlen(id)))
+		if (strncmp(c->id, id, strlen(id)))
 			continue;
 
-		return container;
+		return c;
 	}
 
 	return NULL;
 }
 
 void hyper_cleanup_container(struct hyper_container *c)
 {
-	int i;
-	struct volume *vol;
-	struct env *env;
-	struct fsmap *map;
-	struct sysctl *sys;
 	char root[512];
 
 	sprintf(root, "/tmp/hyper/%s/devpts/", c->id);
 	if (umount(root) < 0 && umount2(root, MNT_DETACH))
 		perror("umount devpts failed");
 
-	free(c->id);
-	free(c->rootfs);
-	free(c->image);
-	free(c->workdir);
-	free(c->fstype);
-
-	for (i = 0; i < c->vols_num; i++) {
-		vol = &(c->vols[i]);
-		free(vol->device);
-		free(vol->mountpoint);
-		free(vol->fstype);
-	}
-	free(c->vols);
-
-	for (i = 0; i < c->envs_num; i++) {
-		env = &(c->envs[i]);
-		free(env->env);
-		free(env->value);
-	}
-	free(c->envs);
-
-	for (i = 0; i < c->sys_num; i++) {
-		sys = &(c->sys[i]);
-		free(sys->path);
-		free(sys->value);
-	}
-	free(c->sys);
-
-	for (i = 0; i < c->maps_num; i++) {
-		map = &(c->maps[i]);
-		free(map->source);
-		free(map->path);
-	}
-	free(c->maps);
 	close(c->ns);
-
-	free(c->exec.id);
-	for (i = 0; i < c->exec.argc; i++) {
-		//fprintf(stdout, "argv %d %s\n", i, exec->argv[i]);
-		free(c->exec.argv[i]);
-	}
-	free(c->exec.argv);
+	hyper_free_container(c);
 }
 
 void hyper_cleanup_containers(struct hyper_pod *pod)
 {
-	int i;
+	struct hyper_container *c, *n;
 
-	for (i = 0; i < pod->c_num; i++)
-		hyper_cleanup_container(&pod->c[i]);
+	list_for_each_entry_safe(c, n, &pod->containers, list)
+		hyper_cleanup_container(c);
 
-	free(pod->c);
-	pod->c = NULL;
-	pod->c_num = 0;
+	pod->remains = 0;
 }

src/container.h

@@ -42,7 +42,7 @@ struct hyper_container {
 	int			sys_num;
 	int			ns;
 	uint32_t		code;
-	struct list_head	dyn;
+	struct list_head	list;
 	struct hyper_exec	exec;
 };
 
@@ -53,5 +53,6 @@ int hyper_start_container(struct hyper_container *container,
 struct hyper_container *hyper_find_container(struct hyper_pod *pod, char *id);
 void hyper_cleanup_container(struct hyper_container *container);
 void hyper_cleanup_containers(struct hyper_pod *pod);
+void hyper_free_container(struct hyper_container *c);
 
 #endif

src/exec.c

@@ -545,15 +545,7 @@ int hyper_release_exec(struct hyper_exec *exec,
 		fprintf(stdout, "%s container init exited, type %d, remains %d, policy %d\n",
 			__func__, pod->type, pod->remains, pod->policy);
 
-		if (exec->init == 2) { // dynamic container
-			struct hyper_container *c = container_of(exec, struct hyper_container, exec);
-			// TODO send finish of this container and full cleanup
-			hyper_cleanup_container(c);
-			list_del(&c->dyn);
-			free(c);
-			return 0;
-		}
-
+		// TODO send finish of this container and full cleanup
 		if (--pod->remains > 0)
 			return 0;
 
@@ -563,7 +555,7 @@ int hyper_release_exec(struct hyper_exec *exec,
 
 		} else {
 			/* send out pod finish message, hyper will decide if restart pod or not */
-			hyper_send_finish(pod);
+			hyper_send_pod_finished(pod);
 		}
 
 		hyper_cleanup_pod(pod);

src/hyper.h

@@ -17,17 +17,18 @@ enum {
 	DESTROYPOD,
 	RESTARTCONTAINER,
 	EXECCMD,
-	FINISHCMD,
+	CMDFINISHED,
 	READY,
 	ACK,
 	ERROR,
 	WINSIZE,
 	PING,
-	FINISH,
+	PODFINISHED,
 	NEXT,
 	WRITEFILE,
 	READFILE,
 	NEWCONTAINER,
+	KILLCONTAINER,
 };
 
 enum {
@@ -41,17 +42,17 @@ struct hyper_pod {
 	struct hyper_interface	*iface;
 	struct hyper_route	*rt;
 	char			**dns;
-	struct list_head	dyn_containers;
+	struct list_head	containers;
 	struct list_head	exec_head;
 	char			*hostname;
 	char			*share_tag;
 	int			init_pid;
-	uint32_t		c_num;
 	uint32_t		i_num;
 	uint32_t		r_num;
 	uint32_t		e_num;
 	uint32_t		d_num;
 	uint32_t		type;
+	/* how many containers are running */
 	uint32_t		remains;
 	uint8_t			policy;
 	int			efd;
@@ -65,6 +66,11 @@ struct hyper_win_size {
 	uint64_t	seq;
 };
 
+struct hyper_killer {
+	char		*id;
+	int		signal;
+};
+
 struct hyper_reader {
 	char		*id;
 	char		*file;

src/init.c

@@ -29,7 +29,7 @@
 #include "container.h"
 
 struct hyper_pod global_pod = {
-	.dyn_containers	=	LIST_HEAD_INIT(global_pod.dyn_containers),
+	.containers	=	LIST_HEAD_INIT(global_pod.containers),
 	.exec_head	=	LIST_HEAD_INIT(global_pod.exec_head),
 };
 struct hyper_exec *global_exec;
@@ -144,6 +144,7 @@ static void hyper_term_all(struct hyper_pod *pod)
 	DIR *dp;
 	struct dirent *de;
 	pid_t *pids = NULL;
+	struct hyper_container *c;
 
 	dp = opendir("/proc");
 	if (dp == NULL)
@@ -175,9 +176,8 @@ static void hyper_term_all(struct hyper_pod *pod)
 	free(pids);
 	closedir(dp);
 
-	for (index = 0; index < pod->c_num; index++) {
-		hyper_kill_process(pod->c[index].exec.pid);
-	}
+	list_for_each_entry(c, &pod->containers, list)
+		hyper_kill_process(c->exec.pid);
 }
 
 static int hyper_handle_exit(struct hyper_pod *pod)
@@ -457,6 +457,8 @@ int hyper_start_container_stage0(struct hyper_container *c, struct hyper_pod *po
 		goto out;
 	}
 
+	/* container process is spawned and ready to execute */
+	pod->remains++;
 	ret = 0;
 out:
 	close(arg.ctl_pipe[0]);
@@ -466,13 +468,13 @@ int hyper_start_container_stage0(struct hyper_container *c, struct hyper_pod *po
 
 int hyper_start_containers(struct hyper_pod *pod)
 {
-	int i, ret = 0;
+	struct hyper_container *c;
 
-	for (i = 0; i < pod->c_num; i++) {
-		ret = hyper_start_container_stage0(&pod->c[i], pod);
-		if (ret)
-			return ret;
+	list_for_each_entry(c, &pod->containers, list) {
+		if (hyper_start_container_stage0(c, pod) < 0)
+			return -1;
 	}
+
 	return 0;
 }
 
@@ -696,25 +698,48 @@ static int hyper_new_container(char *json, int length)
 
 	fprintf(stdout, "call hyper_new_container, json %s, len %d\n", json, length);
 
-	if (!pod->init_pid)
+	if (!pod->init_pid) {
 		fprintf(stdout, "the pod is not created yet\n");
+		return -1;
+	}
 
 	c = hyper_parse_new_container(pod, json, length);
 	if (c == NULL) {
 		fprintf(stderr, "parse container json failed\n");
 		return -1;
 	}
 
+	list_add_tail(&c->list, &pod->containers);
 	ret = hyper_start_container_stage0(c, pod);
 	if (ret < 0) {
 		//TODO full grace cleanup
 		hyper_cleanup_container(c);
-		free(c);
-		return ret;
 	}
 
-	list_add_tail(&c->dyn, &pod->dyn_containers);
-	return 0;
+	return ret;
+}
+
+static int hyper_kill_container(char *json, int length)
+{
+	struct hyper_killer killer;
+	struct hyper_container *c;
+	struct hyper_pod *pod = &global_pod;
+	int ret = -1;
+
+	if (hyper_parse_kill_container(&killer, json, length) < 0) {
+		goto out;
+	}
+
+	c = hyper_find_container(pod, killer.id);
+	if (c == NULL) {
+		fprintf(stderr, "can not find container whose id is %s\n", killer.id);
+		goto out;
+	}
+
+	kill(c->exec.pid, killer.signal);
+	ret = 0;
+out:
+	return ret;
 }
 
 static int hyper_cmd_write_file(char *json, int length)
@@ -1115,7 +1140,7 @@ static int hyper_channel_handle(struct hyper_event *de, uint32_t len)
 		hyper_print_uptime();
 		break;
 	case STOPPOD:
-		ret = hyper_stop_pod(pod);
+		hyper_stop_pod(pod);
 		return 0;
 		//break;
 	case DESTROYPOD:
@@ -1143,6 +1168,9 @@ static int hyper_channel_handle(struct hyper_event *de, uint32_t len)
 	case NEWCONTAINER:
 		ret = hyper_new_container((char *)buf->data + 8, len - 8);
 		break;
+	case KILLCONTAINER:
+		ret = hyper_kill_container((char *)buf->data + 8, len - 8);
+		break;
 	default:
 		ret = -1;
 		break;