X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.h;h=0bfca305fc5b6465aec22db6b5b0c155a682a141;hp=43ba841d28681fc06b92c06d7ccfce95a3a6423f;hb=173091699461dc4c08cb34bdb692cf001d8b578f;hpb=9b565c60fd159e12d255bb18db9dbff066deebea

diff --git a/server.h b/server.h
index 43ba841d..0bfca305 100644
--- a/server.h
+++ b/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,12 +10,12 @@
 #define MMD_INFO_SIZE 16384
 
 /** The maximum length of the host component in an URL */
-#define MAX_HOSTLEN	256
+#define MAX_HOSTLEN 256
 
 
-/** Holds the arguments for the para_server's sender command. */
-struct sender_command_data{
-	/** Greater than 0 indicates that a sender cmd is already queued. */
+/** Arguments for the sender command. */
+struct sender_command_data {
+	/** Greater than zero indicates that a sender cmd is already queued. */
 	int cmd_num;
 	/** The number of the sender in question. */
 	int sender_num;
@@ -34,35 +34,29 @@ struct sender_command_data{
 };
 
 /**
- * Used for parent-child communication.
+ * Miscellaneous data for communication between server and command handlers.
  *
- * There's only one struct of this type which lives in shared memory
- * for communication between the server instances. Access to this
- * area is serialized via mmd_lock() and mmd_unlock(). There are two
- * reasons for a variable to be included here:
+ * There's only one instance of this structure which lives in a shared memory
+ * area. Command handlers communicate with the server process through this
+ * area. Changes made by the command handlers stay after the command handler
+ * exits. Conversely, changes made by the server process propagate to the
+ * command handlers. Access to this area is serialized via mmd_lock() and
+ * mmd_unlock().
  *
- *  	- At least one command (i.e. child of the server) must be able to
- *  	change its value.
- *
- * or
- *
- *	- The contents are listed in the stat command and have to be up to
- *	date.
+ * There are two reasons for a variable to be included here: (a) at least one
+ * command handler changes its value, or (b) updates by the server must
+ * propagate to the stat command handlers.
  */
 struct misc_meta_data {
-	/** The size of the current audio file in bytes. */
-	size_t size;
-	/** The last modification time of the current audio file. */
-	time_t mtime;
 	/** The "old" status flags -- commands may only read them. */
 	unsigned int vss_status_flags;
 	/** The new status flags -- commands may set them. */
 	unsigned int new_vss_status_flags;
-	/** The number of data chunks sent for the current audio file. */
+	/** The number of data chunks sent so far. */
 	long unsigned chunks_sent;
 	/** Set by the jmp/ff commands to the new position in chunks. */
 	long unsigned repos_request;
-	/** The number of the chunk currently sent out. */
+	/** The number of the chunk currently being sent. */
 	long unsigned current_chunk;
 	/** The milliseconds that have been skipped of the current audio file. */
 	long offset;
@@ -71,8 +65,8 @@ struct misc_meta_data {
 	/**
 	 * The event counter.
 	 *
-	 * Commands may increase this to force a status update to be sent to all
-	 * connected clients.
+	 * Commands may increase this to force a status update to be sent to
+	 * all connected stat clients.
 	 */
 	unsigned int events;
 	/** The number of audio files already sent. */
@@ -93,8 +87,37 @@ struct misc_meta_data {
 	struct audio_file_data afd;
 };
 
-/** Command line options for para_server. */
-extern struct server_args_info conf;
+extern struct lls_parse_result *server_lpr;
+
+/**
+ * Get a reference to the supercommand of para_server.
+ *
+ * This is needed for parsing the command line and for the ENUM_STRING_VAL()
+ * macro below. The latter macro is used in command.c, so CMD_PTR() can not
+ * be made local to server.c.
+ */
+#define CMD_PTR (lls_cmd(0, server_suite))
+
+/** Get the parse result of an option to para_server. */
+#define OPT_RESULT(_name) (lls_opt_result( \
+		LSG_SERVER_PARA_SERVER_OPT_ ## _name, server_lpr))
+
+/** How many times a server option was given. */
+#define OPT_GIVEN(_name) (lls_opt_given(OPT_RESULT(_name)))
+
+/** The (first) argument to a server option of type string. */
+#define OPT_STRING_VAL(_name) (lls_string_val(0, OPT_RESULT(_name)))
+
+/** The (first) argument to a server option of type uint32. */
+#define OPT_UINT32_VAL(_name) (lls_uint32_val(0, OPT_RESULT(_name)))
+
+/** The (first) argument to a server option of type int32. */
+#define OPT_INT32_VAL(_name) (lls_int32_val(0, OPT_RESULT(_name)))
+
+/** Get the string which corresponds to an enum constant. */
+#define ENUM_STRING_VAL(_name) (lls_enum_string_val(OPT_UINT32_VAL(_name), \
+	lls_opt(LSG_SERVER_PARA_SERVER_OPT_ ## _name, CMD_PTR)))
 
 __noreturn void handle_connect(int fd, const char *peername);
-void parse_config_or_die(int override);
+void parse_config_or_die(bool reload);
+char *server_get_tasks(void);