From 050ca7ac7e99cf624090c87b06714ea457e084ec Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Mon, 25 Nov 2013 10:12:08 +0100 Subject: [PATCH] Some fixes for doxygen generation --- README | 4 ++-- build_gateway.inc | 6 +++--- server/core/dcb.c | 22 +++++++--------------- server/core/gateway.c | 10 +++------- server/core/hashtable.c | 4 +--- server/core/poll.c | 5 +++-- server/core/session.c | 2 +- server/modules/protocol/mysql_common.c | 9 ++++----- 8 files changed, 24 insertions(+), 38 deletions(-) diff --git a/README b/README index 11f3ba70e..d719db4cb 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ function pointers. This structured is called the "module object". The code that routes the queries to the database servers is also loaed as external shared objects and are referred to as routing modules. -\section Building Building the MaxScale +\section Building Building MaxScale Edit the file build_gateway.inc in your skygateway directory and set the ROOT_PATH and MARIADB_SRC_PATH variables to the location in which @@ -53,7 +53,7 @@ Two files are required for the libmysqld library that is used within MaxScale, [mysqld] max_connections=4096 -\section Running Running the MaxScale +\section Running Running MaxScale The gateway consists of a core executable and a number of modules that implement the different protocols and routing algorithms. These modules are built as diff --git a/build_gateway.inc b/build_gateway.inc index 8fa775ad7..7e65ff5e3 100644 --- a/build_gateway.inc +++ b/build_gateway.inc @@ -23,10 +23,10 @@ UNIX := # makefile.inc and build_gateway.inc are located. # ROOT_PATH is used in makefile. # -ROOT_PATH := /home/jdoe/skysql/maxscale +ROOT_PATH := /home/mriddoch/Repository/maxscale # MARIADB_SRC_PATH may be defined either as an environment variable or # specifically here -ifndef MARIADB_SRC_PATH - MARIADB_SRC_PATH := /home/jdoe/mariadb/5.5 +ifndef $(MARIADB_SRC_PATH) + MARIADB_SRC_PATH := /packages/mariadb-5.5.25 endif diff --git a/server/core/dcb.c b/server/core/dcb.c index 6e2c32ea4..65c07ee84 100644 --- a/server/core/dcb.c +++ b/server/core/dcb.c @@ -136,19 +136,13 @@ if ((rval = calloc(1, sizeof(DCB))) == NULL) } /** - * @node DCB is added to the end of zombies list. + * Add the DCB to the end of zombies list. * - * Parameters: - * @param dcb - - * - * - * @return - * - * - * @details Adding to list occurs once per DCB. This is ensured by changing the + * Adding to list occurs once per DCB. This is ensured by changing the * state of DCB to DCB_STATE_ZOMBIE after addition. Prior insertion, DCB state * is checked and operation proceeds only if state differs from DCB_STATE_ZOMBIE. - * + * @param dcb The DCB to add to the zombie list + * @return none */ void dcb_add_to_zombieslist(DCB *dcb) @@ -878,16 +872,14 @@ int saved_errno = 0; } /** - * @node Removes dcb from poll set, and adds it to zombies list. As a consequense, + * Removes dcb from poll set, and adds it to zombies list. As a consequense, * dcb first moves to DCB_STATE_NOPOLLING, and then to DCB_STATE_ZOMBIE state. * At the end of the function state may not be DCB_STATE_ZOMBIE because once dcb_initlock * is released parallel threads may change the state. * * Parameters: - * @param dcb - - * - * - * @return + * @param dcb The DCB to close + * @return none * * * @details (write detailed description here) diff --git a/server/core/gateway.c b/server/core/gateway.c index 416ca4d90..1c1b666a3 100644 --- a/server/core/gateway.c +++ b/server/core/gateway.c @@ -381,14 +381,10 @@ static void print_log_n_stderr( /** - * @node The main entry point into the gateway + * The main entry point into the gateway * - * Parameters: - * @param argc - in, use - * The argument count - * - * @param argv - in, use - * The arguments themselves + * @param argc The argument count + * @param argv The array of arguments themselves * * @return 0 in success, 1 otherwise * diff --git a/server/core/hashtable.c b/server/core/hashtable.c index b9e7bf68a..a014ea91a 100644 --- a/server/core/hashtable.c +++ b/server/core/hashtable.c @@ -332,7 +332,7 @@ HASHENTRIES *entries; } /** - * @node Produces stat output about hashtable + * Produces stat output about hashtable * * Parameters: * @param table - @@ -349,8 +349,6 @@ HASHENTRIES *entries; * * @return void * - * - * @details (write detailed description here) * */ void hashtable_get_stats( diff --git a/server/core/poll.c b/server/core/poll.c index fb1bf2a52..d2f4d9222 100644 --- a/server/core/poll.c +++ b/server/core/poll.c @@ -213,8 +213,9 @@ return_rc: } #define BLOCKINGPOLL 0 /* Set BLOCKING POLL to 1 if using a single thread and to make -* debugging easier. -*/ + * debugging easier. + */ + /** * The main polling loop * diff --git a/server/core/session.c b/server/core/session.c index 63a2742b9..a60050d6d 100644 --- a/server/core/session.c +++ b/server/core/session.c @@ -54,7 +54,7 @@ static SESSION *allSessions = NULL; * service this session is part of. * * @param service The service this connection was established by - * @param client The client side DCB + * @param client_dcb The client side DCB * @return The newly created session or NULL if an error occured */ SESSION * diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c index 5c9cdc229..8723e1747 100644 --- a/server/modules/protocol/mysql_common.c +++ b/server/modules/protocol/mysql_common.c @@ -40,11 +40,10 @@ extern int gw_error_backend_event(DCB *dcb); /** - * @node Creates MySQL protocol structure + * Creates MySQL protocol structure * - * Parameters: - * @param dcb - in, use - * Must be non-NULL. + * @param dcb * Must be non-NULL. + * @param fd * * @return * @@ -295,7 +294,7 @@ int gw_decode_mysql_server_handshake(MySQLProtocol *conn, uint8_t *payload) { /** * Receive the MySQL authentication packet from backend, packet # is 2 * - * @param conn The MySQL protocol structure + * @param protocol The MySQL protocol structure * @return -1 in case of failure, 0 if there was nothing to read, 1 if read * was successful. */