X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=drm-lease-manager%2Fmain.c;h=ff69e7528b79ffa24126e31a28c8c5625655b739;hb=e9e5cf1f67a45e4d409dc9e1caa6ce8151579c88;hp=78ff0df6e5871c255046a4dabc78fe5c23b433aa;hpb=bdf7c337439ff0b70b67462c1f00f5b61942e76a;p=src%2Fdrm-lease-manager.git

diff --git a/drm-lease-manager/main.c b/drm-lease-manager/main.c
index 78ff0df..ff69e75 100644
--- a/drm-lease-manager/main.c
+++ b/drm-lease-manager/main.c
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+#include "lease-config.h"
 #include "lease-manager.h"
 #include "lease-server.h"
 #include "log.h"
@@ -27,25 +28,32 @@ static void usage(const char *progname)
 	printf("Usage: %s [OPTIONS] [<DRM device>]\n\n"
 	       "Options:\n"
 	       "-h, --help \tPrint this help\n"
+	       "-c, --config \t path to configuration file (default "
+	       "/etc/drm-lease-manager.toml)\n"
 	       "-v, --verbose \tEnable verbose debug messages\n"
-	       "-t, --lease-transfer \tAllow lease transfter to new clients\n",
+	       "-t, --lease-transfer \tAllow lease transfter to new clients\n"
+	       "-k, --keep-on-crash \tDon't close lease on client crash\n",
 	       progname);
 }
 
-const char *opts = "vth";
+const char *opts = "vtkhc:";
 const struct option options[] = {
     {"help", no_argument, NULL, 'h'},
     {"verbose", no_argument, NULL, 'v'},
     {"lease-transfer", no_argument, NULL, 't'},
+    {"keep-on-crash", no_argument, NULL, 'k'},
+    {"config", required_argument, NULL, 'c'},
     {NULL, 0, NULL, 0},
 };
 
 int main(int argc, char **argv)
 {
 	char *device = "/dev/dri/card0";
+	char *config_file = "/etc/drm-lease-manager.toml";
 
 	bool debug_log = false;
 	bool can_transfer_leases = false;
+	bool keep_on_crash = false;
 
 	int c;
 	while ((c = getopt_long(argc, argv, opts, options, NULL)) != -1) {
@@ -57,6 +65,12 @@ int main(int argc, char **argv)
 		case 't':
 			can_transfer_leases = true;
 			break;
+		case 'k':
+			keep_on_crash = true;
+			break;
+		case 'c':
+			config_file = optarg;
+			break;
 		case 'h':
 			ret = EXIT_SUCCESS;
 			/* fall through */
@@ -71,7 +85,12 @@ int main(int argc, char **argv)
 
 	dlm_log_enable_debug(debug_log);
 
-	struct lm *lm = lm_create(device);
+	struct lease_config *lease_configs = NULL;
+	int num_configs = parse_config(config_file, &lease_configs);
+
+	struct lm *lm =
+	    lm_create_with_config(device, num_configs, lease_configs);
+
 	if (!lm) {
 		ERROR_LOG("DRM Lease initialization failed\n");
 		return EXIT_FAILURE;
@@ -122,9 +141,14 @@ int main(int argc, char **argv)
 			break;
 		}
 		case LS_REQ_RELEASE_LEASE:
+		case LS_REQ_CLIENT_DISCONNECT:
 			ls_disconnect_client(ls, req.client);
 			req.lease_handle->user_data = NULL;
 			lm_lease_revoke(lm, req.lease_handle);
+
+			if (!keep_on_crash || req.type == LS_REQ_RELEASE_LEASE)
+				lm_lease_close(req.lease_handle);
+
 			break;
 		default:
 			ERROR_LOG("Internal error: Invalid lease request\n");
@@ -134,5 +158,6 @@ int main(int argc, char **argv)
 done:
 	ls_destroy(ls);
 	lm_destroy(lm);
+	release_config(num_configs, lease_configs);
 	return EXIT_FAILURE;
 }