Merge pull request #235 from laijs/update-hyperstart-api

Update hyperstart api

Author: gao-feng

src/api.h

@@ -1,33 +1,35 @@
 #ifndef _HYPERSTART_API_H_
 #define _HYPERSTART_API_H_
 
-#define APIVERSION 4242
+// when APIVERSION < 1000000, the version MUST be exactly matched on both sides
+#define APIVERSION 4243
 
 // control command id
 enum {
-	GETVERSION,
+	GETVERSION,			// 0
 	STARTPOD,
-	GETPOD,
+	GETPOD_DEPRECATED,
 	STOPPOD_DEPRECATED,
 	DESTROYPOD,
-	RESTARTCONTAINER,
+	RESTARTCONTAINER_DEPRECATED,	// 5
 	EXECCMD,
-	CMDFINISHED,
+	CMDFINISHED_DEPRECATED,
 	READY,
 	ACK,
-	ERROR,
+	ERROR,				// 10
 	WINSIZE,
 	PING,
-	PODFINISHED,
+	PODFINISHED_DEPRECATED,
 	NEXT,
-	WRITEFILE,
+	WRITEFILE,			// 15
 	READFILE,
 	NEWCONTAINER,
 	KILLCONTAINER,
 	ONLINECPUMEM,
-	SETUPINTERFACE,
+	SETUPINTERFACE,			// 20
 	SETUPROUTE,
 	REMOVECONTAINER,
+	PROCESSASYNCEVENT,
 };
 
 /*

src/exec.c

@@ -56,7 +56,13 @@ static int hyper_send_exec_eof(struct hyper_exec *exec) {
 }
 
 static int hyper_send_exec_code(struct hyper_exec *exec) {
-	return send_exec_finishing(exec->seq, 13, exec->code);
+	char *pae; // ProcessAsyncEvent
+#define PAE "{\"container\":\"%s\",\"process\":\"%s\",\"event\":\"finished\",\"status\":%d}"
+	if (asprintf(&pae, PAE, exec->container_id, exec->id, exec->code) < 0) {
+		return -1;
+	}
+#undef PAE
+	return hyper_ctl_append_msg(&hyper_epoll.ctl, PROCESSASYNCEVENT, (uint8_t *)pae, strlen(pae));
 }
 
 static void pts_hup(struct hyper_event *de, int efd, struct hyper_exec *exec)
@@ -703,9 +709,6 @@ static int hyper_release_exec(struct hyper_exec *exec)
 		if (exec->pod->req_destroy) {
 			/* shutdown vm manually, hyper doesn't care the pod finished codes */
 			hyper_pod_destroyed(0);
-		} else {
-			/* send out pod finish message, hyper will decide if restart pod or not */
-			hyper_send_pod_finished(exec->pod);
 		}
 
 		hyper_cleanup_pod(exec->pod);
@@ -716,6 +719,19 @@ static int hyper_release_exec(struct hyper_exec *exec)
 	return 0;
 }
 
+struct hyper_exec *hyper_find_exec_by_name(struct hyper_pod *pod, const char *process)
+{
+	struct hyper_exec *exec;
+
+	list_for_each_entry(exec, &pod->exec_head, list) {
+		if (strcmp(exec->id, process) == 0) {
+			return exec;
+		}
+	}
+
+	return NULL;
+}
+
 struct hyper_exec *hyper_find_exec_by_pid(struct list_head *head, int pid)
 {
 	struct hyper_exec *exec;

src/exec.h

@@ -27,6 +27,7 @@ struct hyper_exec {
 
 	// configs
 	char			*container_id;
+	char			*id;
 	char			*user;
 	char			*group;
 	char			**additional_groups;
@@ -45,6 +46,7 @@ struct hyper_pod;
 
 int hyper_exec_cmd(char *json, int length);
 int hyper_run_process(struct hyper_exec *e);
+struct hyper_exec *hyper_find_exec_by_name(struct hyper_pod *pod, const char *process);
 struct hyper_exec *hyper_find_exec_by_pid(struct list_head *head, int pid);
 struct hyper_exec *hyper_find_exec_by_seq(struct hyper_pod *pod, uint64_t seq);
 int hyper_handle_exec_exit(struct hyper_pod *pod, int pid, uint8_t code);

src/hyper.h

@@ -85,7 +85,7 @@ int hyper_open_serial(char *tty);
 void hyper_cleanup_pod(struct hyper_pod *pod);
 int hyper_enter_sandbox(struct hyper_pod *pod, int pidpipe);
 void hyper_pod_destroyed(int failed);
-int hyper_send_pod_finished(struct hyper_pod *pod);
+int hyper_ctl_append_msg(struct hyper_event *he, uint32_t type, uint8_t *data, uint32_t len);
 
 extern struct hyper_pod global_pod;
 extern struct hyper_epoll hyper_epoll;

src/init.c

@@ -42,50 +42,40 @@ struct hyper_epoll hyper_epoll;
 sigset_t orig_mask;
 
 static int hyper_handle_exit(struct hyper_pod *pod);
-static int hyper_ctl_append_msg(struct hyper_event *he, uint32_t type, uint8_t *data, uint32_t len);
 
-int hyper_send_pod_finished(struct hyper_pod *pod)
-{
-	struct hyper_container *c;
-	uint8_t *data = NULL, *new;
-	int c_num = 0;
-
-	list_for_each_entry(c, &pod->containers, list) {
-		c_num++;
-		new = realloc(data, c_num * 4);
-		if (new == NULL) {
-			free(data);
-			return -1;
-		}
-
-		hyper_set_be32(new + ((c_num - 1) * 4), c->exec.code);
-		data = new;
-	}
-
-	return hyper_ctl_append_msg(&hyper_epoll.ctl, PODFINISHED, data, c_num * 4);
-}
-
-static int hyper_set_win_size(char *json, int length)
+static int hyper_set_win_size(struct hyper_pod *pod, char *json, int length)
 {
 	struct winsize size;
 	struct hyper_exec *exec;
-	int ret;
+	int ret = -1;
 
-	fprintf(stdout, "call hyper_win_size, json %s, len %d\n", json, length);
+	fprintf(stdout, "call hyper_set_win_size, json %s, len %d\n", json, length);
 	JSON_Value *value = hyper_json_parse(json, length);
 	if (value == NULL) {
 		fprintf(stderr, "set term size failed\n");
-		ret = -1;
 		goto out;
 	}
-	const uint64_t seq = (uint64_t)json_object_get_number(json_object(value), "seq");
+	const char *container = json_object_get_string(json_object(value), "container");
+	const char *process = json_object_get_string(json_object(value), "process");
+	if (!container || !process) {
+		fprintf(stderr, "call hyper_set_win_size, invalid config");
+		goto out;
+	}
 
-	exec = hyper_find_exec_by_seq(&global_pod, seq);
-	if (exec == NULL) {
-		fprintf(stdout, "can not find exec whose seq is %" PRIu64"\n", seq);
-		ret = 0;
+	struct hyper_container *c = hyper_find_container(pod, container);
+	if (!c) {
+		fprintf(stderr, "call hyper_set_win_size, can not find the container: %s\n", container);
 		goto out;
 	}
+	if (strcmp(c->exec.id, process) == 0) {
+		exec = &c->exec;
+	} else {
+		exec = hyper_find_exec_by_name(pod, process);
+		if (!exec) {
+			fprintf(stderr, "call hyper_set_win_size, can not find the process: %s\n", process);
+			goto out;
+		}
+	}
 
 	size.ws_row = (int)json_object_get_number(json_object(value), "row");
 	size.ws_col = (int)json_object_get_number(json_object(value), "column");
@@ -1069,7 +1059,7 @@ static int hyper_ttyfd_read(struct hyper_event *he, int efd, int events)
 	return ret == 0 ? 0 : -1;
 }
 
-static int hyper_ctl_append_msg(struct hyper_event *he, uint32_t type, uint8_t *data, uint32_t len)
+int hyper_ctl_append_msg(struct hyper_event *he, uint32_t type, uint8_t *data, uint32_t len)
 {
 	int ret = -1;
 	fprintf(stdout, "hyper ctl append type %d, len %d\n", type, len);
@@ -1118,10 +1108,6 @@ static int hyper_ctlmsg_handle(struct hyper_event *he, uint32_t len)
 		ret = hyper_start_pod((char *)buf->data + 8, len - 8);
 		hyper_print_uptime();
 		break;
-	case STOPPOD_DEPRECATED:
-		fprintf(stderr, "get abandoned STOPPOD message\n");
-		ret = -1;
-		break;
 	case DESTROYPOD:
 		pod->req_destroy = 1;
 		fprintf(stdout, "get DESTROYPOD message\n");
@@ -1137,13 +1123,12 @@ static int hyper_ctlmsg_handle(struct hyper_event *he, uint32_t len)
 		ret = hyper_cmd_rw_file((char *)buf->data + 8, len - 8, &datalen, &data, READFILE);
 		break;
 	case PING:
-	case GETPOD:
 		break;
 	case READY:
 		ret = hyper_rescan();
 		break;
 	case WINSIZE:
-		ret = hyper_set_win_size((char *)buf->data + 8, len - 8);
+		ret = hyper_set_win_size(pod, (char *)buf->data + 8, len - 8);
 		break;
 	case NEWCONTAINER:
 		ret = hyper_new_container((char *)buf->data + 8, len - 8);
@@ -1163,6 +1148,14 @@ static int hyper_ctlmsg_handle(struct hyper_event *he, uint32_t len)
 	case SETUPROUTE:
 		ret = hyper_cmd_setup_route((char *)buf->data + 8, len - 8);
 		break;
+	case GETPOD_DEPRECATED:
+	case STOPPOD_DEPRECATED:
+	case RESTARTCONTAINER_DEPRECATED:
+	case CMDFINISHED_DEPRECATED:
+	case PODFINISHED_DEPRECATED:
+		fprintf(stderr, "get abandoned command\n");
+		ret = -1;
+		break;
 	default:
 		ret = -1;
 		break;

src/parse.c

@@ -188,6 +188,9 @@ void hyper_cleanup_exec(struct hyper_exec *exec)
 	free(exec->container_id);
 	exec->container_id = NULL;
 
+	free(exec->id);
+	exec->id = NULL;
+
 	free(exec->user);
 	exec->user = NULL;
 	free(exec->group);
@@ -474,7 +477,11 @@ static int hyper_parse_process(struct hyper_exec *exec, char *json, jsmntok_t *t
 	for (j = 0; j < toks_size; j++) {
 		t = &toks[i];
 		dprintf(stdout, "%d name %s\n", i, json_token_str(json, t));
-		if (json_token_streq(json, t, "user") && t->size == 1) {
+		if (json_token_streq(json, t, "id") && t->size == 1) {
+			exec->id = (json_token_str(json, &toks[++i]));
+			dprintf(stdout, "container process id %s\n", exec->id);
+			i++;
+		} else if (json_token_streq(json, t, "user") && t->size == 1) {
 			exec->user = (json_token_str(json, &toks[++i]));
 			dprintf(stdout, "container process user %s\n", exec->user);
 			i++;