DistRen Changeset - 92659c5651ef · protofusion repositories

Changeset - 92659c5651ef

Parent rev.

Child rev.

[Not reviewed]

default

1 23 0

Nathan Brink (binki) - 15 years ago 2010-07-22 00:03:45
ohnobinki@ohnopublishing.net

Reformed buildsystem.
- replace malloc.h with stdlib.h
- use AC_CONFIG_HEADERS for cleaner compile output
- clean out some useless AC_* macros and add useful AC_TYPE_UINT* macros

24 files changed with 91 insertions and 93 deletions:

configure.ac

m4/pkgconfig_ohnowrap.m4

src/client/distren.c

src/client/libdistren.c

src/client/libdistren_config.c

src/client/libdistren_job.c

src/client/libdistren_unbias.c

src/common/asprintf.c

src/common/execio.c

src/common/misc.c

src/common/multiio.c

src/common/options.c

src/common/protocol.c

src/common/remoteio.c

src/common/request.c

src/server/distrend.c

src/server/distrenjob.c

src/server/listen.c

src/server/mysql.c

src/server/simpleslave.c

src/server/slave.c

src/server/slavefuncs.c

src/server/tabletennis.c

src/server/user_mgr.c

0 comments (0 inline, 0 general)

configure.ac

➞

Show inline comments

@@ @@ -14,63 +14,52 @@ @@
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.61)
 AC_INIT([distren],[0.0],[http://bugs.ohnopub.net/], [], [http://ohnopub.net/distren/])
 AC_CONFIG_HEADERS([src/common/config.h])
 AC_CONFIG_SRCDIR([src/server/distrend.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
 AC_PROG_LIBTOOL
 #AC_PROG_RANLIB #don't add this even if autoscan says to, because AC_PROG_LIBTOOL is enough
 AM_INIT_AUTOMAKE([gnu dist-bzip2 subdir-objects -Wall])
 AM_PROG_CC_C_O
 #basic low-level checks (suggested by autoscan)
 AC_CHECK_FUNCS([dup2])
 AC_CHECK_FUNCS([memset])
 AC_CHECK_FUNCS([strdup])
 AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([malloc.h])
 AC_FUNC_FORK
 AC_FUNC_MALLOC
 dnl these macros force the refered to types to be available without me
 dnl writing my own magic :-)
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 # selective compilation
 # For now, this is only left for when the C-based client is
 # reintroducded.
 AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 dnl selective compilation
 dnl For now, this is only left for when the C-based client is
 dnl reintroducded.
 AC_ARG_ENABLE([server],
 	[AS_HELP_STRING([--disable-server],[Don't build the distren server])],
 	[enable_server=$enableval],
 	[enable_server=yes])
 AM_CONDITIONAL([ENABLE_SERVER],
 	[test "x$enable_server" = "xyes"])
 # to grab GNU-specific function prototypes for the following functions:
 # getline
 AC_DEFINE([_GNU_SOURCE], [1])
 dnl package dependencies:
 #package dependencies:
 PKG_PROG_PKG_CONFIG(0.17.2)
 PKGCONFIG_OHNOWRAP([DISTLIBS], [libconfuse >= 2.5 libcurl libxml-2.0 liblist >= 2.2.1 libarchive >= 2.8.0 ])
 PKG_CHECK_MODULES([DISTLIBS], [libconfuse >= 2.5 libcurl libxml-2.0 liblist >= 2.3.1 libarchive >= 2.8.0])
 AX_LIB_MYSQL
 AS_IF( [test "x${MYSQL_VERSION}" = "x"],
 	[ AC_MSG_ERROR([I need mysql]) ] )
-PKGCONFIG_OHNOWRAP([CHECK], [check >= 0.9.3])
+PKG_CHECK_MODULES([CHECK], [check >= 0.9.3])
 # define paths for configuration files:
 dnl define paths for configuration files until a better arrangement is
 dnl made:
 AC_DEFINE_DIR([LOCALSTATEDIR], [localstatedir], [Default directory for storing state information])
 AC_DEFINE_DIR([RUNSTATEDIR], [localstatedir/run], [Default directory for registering runtime information like pid-files])
 AC_CONFIG_FILES([Makefile
 etc/distrendaemon.conf

m4/pkgconfig_ohnowrap.m4

➞

Show inline comments

deleted file

src/client/distren.c

➞

Show inline comments

@@ @@ -26,21 +26,22 @@ @@
  * PHP adds the users... has captcha and email confirmation wth a pseudo-random number that
  * the user must enter on the site. Apache should be running mod_peruser for safety, and I'm
  * thinking zserver2 for web serving for convenience...
  */
 #include "common/config.h"
 #include "distren.h"
 #include <stdio.h> /* sprintf, printf */
 #include <stdlib.h> /* malloc, free */
 #include <unistd.h> /* getopt */
 #include <confuse.h>
 #include <string.h> // for strcat
 int main(int argc, char *argv[])
+{
   int doLogin = 0;
   char *input;
   char *output;

src/client/libdistren.c

➞

Show inline comments

@@ @@ -18,16 +18,18 @@ @@
 */
 /*
   Implementation of distren_* functions from distren.h excluding distren_job_* functions.
  */
 #include "common/config.h"
 #include "libdistren.h"
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 /**
    @todo needs to read configuration in
  */
 int distren_init_mf(distren_t *handle, distren_malloc_t mymalloc, distren_free_t myfree)
+{

src/client/libdistren_config.c

➞

Show inline comments

@@ @@ -18,12 +18,14 @@ @@
 */
 /*
   Functions and code for retrieving the client's configuration information.
  */
 #include "common/config.h"
 #include "client/libdistren.h"
 #include "common/options.h"
 /**
 @todo Stub
  */

src/client/libdistren_job.c

➞

Show inline comments

@@ @@ -18,12 +18,14 @@ @@
 */
 /*
   Implementation of distren_job_* functions from distren.h.
  */
 #include "common/config.h"
 #include "libdistren.h"
 /**
    @todo Stub
  */
 int distren_job_getid(distren_job_t job, char **jobid)

src/client/libdistren_unbias.c

➞

Show inline comments

@@ @@ -18,12 +18,14 @@ @@
 */
 /*
   Implementation of libdistren functions that exist to prevent this library from being biased toward certain methods of reporting errors/debug info or free()ing and malloc()ing
  */
 #include "common/config.h"
 #include "libdistren.h"
 void *_malloc(distren_t distren, size_t size)
+{
   return (*distren->malloc)(size);
+}

src/common/asprintf.c

➞

Show inline comments

@@ @@ -14,12 +14,14 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 int _distren_asprintf(char **strp, const char *fmt, ...)

src/common/execio.c

➞

Show inline comments

@@ @@ -14,21 +14,22 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "execio.h"
 #include "common/config.h"
 #include "common/execio.h"
 #include <unistd.h>
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
 #endif
 #include <signal.h>
 #include <malloc.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 int execio_open(struct execio **rem, const char *progname, char *const argv[])

src/common/misc.c

➞

Show inline comments

@@ @@ -14,18 +14,20 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "common/misc.h"
 #include <errno.h>
 #include <malloc.h>
 #include <unistd.h>
 #include <stddef.h>
 #include <stdlib.h>
 char *distren_getcwd()
+{
   char *mycwd;
   size_t counter;

src/common/multiio.c

➞

Show inline comments

@@ @@ -15,19 +15,21 @@ @@
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "common/multiio.h"
 #include <list.h>
 #include <fcntl.h>
 #include <malloc.h>
 #include <poll.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 struct multiio_socket_info
+{
   /* the type of socket */
   multiio_socket_type_t socket_type;

src/common/options.c

➞

Show inline comments

@@ @@ -14,12 +14,14 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "common/options.h"
 #include "common/asprintf.h"
 #include "common/misc.h"
 #include "common/multiio.h"
 #include "common/libremoteio.h"

src/common/protocol.c

➞

Show inline comments

@@ @@ -14,17 +14,19 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "protocol.h"
 #include "remoteio.h"
 #include "common/config.h"
 #include <malloc.h>
 #include "common/protocol.h"
 #include "common/remoteio.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #define DISTREN_REQUEST_MAGIC ((uint32_t)0x32423434)
 int distren_request_new(struct distren_request **req, uint32_t len, enum distren_request_type type)
+{

src/common/remoteio.c

➞

Show inline comments

@@ @@ -15,15 +15,17 @@ @@
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "libremoteio.h"
 #include "execio.h"
 #include "asprintf.h"
 #include "common/config.h"
 #include "common/libremoteio.h"
 #include "common/execio.h"
 #include "common/asprintf.h"
 #include <list.h>
 #include <errno.h>
 #ifndef _WIN32
 #include <netdb.h>
@@ @@ -113,18 +115,18 @@ int remoteio_config(cfg_t *cfg, struct r @@
   struct remoteio_server aserver;
   multiio_socket_type_register(opts->multiio, &opts->socket_type);
   multiio_event_handler_register(opts->multiio,
 				 opts->socket_type,
-				 POLLWRNORM,
+				 POLLOUT,
 				 (multiio_event_handler_func_t)&_remoteio_handle_write,
 				 opts);
   multiio_event_handler_register(opts->multiio,
 				 opts->socket_type,
-				 POLLRDNORM,
+				 POLLIN,
 				 (multiio_event_handler_func_t)&_remoteio_handle_read,
 				 opts);
   opts->servers = list_init();
   if(!opts->servers)
+    {
@@ @@ -221,13 +223,13 @@ int remoteio_open_socket(struct remoteio @@
   struct remoteio *rem;
   if(remoteio_open_common(remoteio, REMOTEIO_METHOD_SOCKET, opts, read_handler, read_handler_data, close_handler))
     return 1;
   rem = *remoteio;
   rem->sock = fd;
-  multiio_socket_add(opts->multiio, rem->sock, opts->socket_type, rem, POLLRDNORM);
+  multiio_socket_add(opts->multiio, rem->sock, opts->socket_type, rem, POLLIN);
   return 0;
+}
 int remoteio_open_server(struct remoteio **remoteio,
 			 struct remoteio_opts *opts,
@@ @@ -278,13 +280,13 @@ int remoteio_open_server(struct remoteio @@
   /**
    * @todo make this code slightly more generic... able to handle
    * execio's multi-sockets by letting execio register itself with
    * multiio instead of us registering here perhaps
    */
-  multiio_socket_add(opts->multiio, rem->sock, opts->socket_type, rem, POLLRDNORM);
+  multiio_socket_add(opts->multiio, rem->sock, opts->socket_type, rem, POLLIN);
   return 0;
+}
 /**
  * Implementation of multiio_event_handler_func_t
@@ @@ -368,16 +370,16 @@ int remoteio_write(struct remoteio *rem, @@
    * Write to the client immediately if there are no other messages
    * waiting and if the client will accept it.
    */
   if(q_empty(rem->outmsgs))
+    {
       pollfd.fd = rem->sock;
-      pollfd.revents = POLLWRNORM;
+      pollfd.revents = POLLOUT;
       pollfd.events = 0;
       poll(&pollfd, 1, 0);
-      if(pollfd.events & POLLWRNORM)
+      if(pollfd.events & POLLOUT)
+	{
 	  bytes_written = write(rem->sock, buf, len);
 	  if(bytes_written > 0)
+	    {
 	      len -= bytes_written;
 	      buf += bytes_written;
@@ @@ -408,13 +410,13 @@ int remoteio_write(struct remoteio *rem, @@
       return 1;
+    }
   memcpy(packet->data, buf, len);
   q_enqueue(rem->outmsgs, packet, 0);
-  multiio_socket_event_enable(rem->opts->multiio, rem->sock, POLLWRNORM);
+  multiio_socket_event_enable(rem->opts->multiio, rem->sock, POLLOUT);
   return 0;
+}
 int _remoteio_handle_write(multiio_context_t multiio,
 			   int fd,
@@ @@ -432,13 +434,13 @@ int _remoteio_handle_write(multiio_conte @@
   /*
    * check if we're out of stuff to write.
    */
   if(q_empty(rem->outmsgs))
+    {
-      multiio_socket_event_disable(multiio, fd, POLLWRNORM);
+      multiio_socket_event_disable(multiio, fd, POLLOUT);
       return 0;
+    }
   packet = q_front(rem->outmsgs);
   tmp = funcmap[rem->method].write_func(rem, packet->data, packet->len, &written_amount);
@@ @@ -452,13 +454,13 @@ int _remoteio_handle_write(multiio_conte @@
   if(packet->len == written_amount)
+    {
       q_dequeue(rem->outmsgs);
       remoteio_packet_free(packet);
       if(q_empty(rem->outmsgs))
-	multiio_socket_event_disable(multiio, fd, POLLWRNORM);
+	multiio_socket_event_disable(multiio, fd, POLLOUT);
+    }
   else
+    {
       /**
        * shifting seems the simplest solution.
        */

src/common/request.c

➞

Show inline comments

@@ @@ -14,12 +14,14 @@ @@
  * GNU Affero General Public License for more details.
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "common/config.h"
 #include "common/protocol.h"
 #include <stdlib.h>
 #include <string.h>
 int distren_request_free_with_data(struct distren_request *req, void *data)

src/server/distrend.c

➞

Show inline comments

@@ @@ -17,24 +17,25 @@ @@
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* This file contains the code which both processes (renders) jobs as a slave, and the code which distributes frames to slaves after receiving them from the client portion of the codebase. */
 #include "common/config.h"
 #include "distrenjob.h"
 #include "listen.h"
 #include "slavefuncs.h"
 #include "mysql.h"
 #include "common/asprintf.h"
 #include "common/execio.h"
 #include "common/options.h"
 #include "common/protocol.h"
 #include <confuse.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>

src/server/distrenjob.c

➞

Show inline comments

@@ @@ -14,20 +14,23 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "distrenjob.h"
 #include "slavefuncs.h"
 #include "common/asprintf.h"
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xmlwriter.h>
 #include <time.h>
 void distrenjob_free(struct distrenjob **distrenjob)
+{
   struct distrenjob *dj;
   dj = *distrenjob;

src/server/listen.c

➞

Show inline comments

@@ @@ -14,21 +14,24 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "listen.h"
 #include "common/protocol.h"
 #include "common/remoteio.h"
 #include <errno.h>
 #include <list.h>
 #include <malloc.h>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <poll.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ @@ -100,13 +103,13 @@ struct distrend_listens *distrend_listen @@
 				 listens->socket_type,
 				 POLLERR | POLLHUP | POLLNVAL,
 				 (multiio_event_handler_func_t)&listen_handle_error,
 				 listens);
   multiio_event_handler_register(multiio,
 				 listens->socket_type,
-				 POLLRDNORM,
+				 POLLIN,
 				 (multiio_event_handler_func_t)&listen_handle_accept,
 				 listens);
   return listens;
+}
@@ @@ -153,13 +156,13 @@ int distrend_listen_add(struct distrend_ @@
       close(fd);
       return 1;
+    }
   *saved_port = port;
-  tmp = multiio_socket_add(listens->multiio, fd, listens->socket_type, saved_port, POLLRDNORM);
+  tmp = multiio_socket_add(listens->multiio, fd, listens->socket_type, saved_port, POLLIN);
   if(tmp)
+    {
       close(fd);
       return 1;
+    }

src/server/mysql.c

➞

Show inline comments

@@ @@ -15,12 +15,14 @@ @@
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "mysql.h"
 #include <mysql/mysql.h>
 #include "common/asprintf.h"
 #include "common/protocol.h"

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -15,12 +15,14 @@ @@
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "slavefuncs.h"
 #include "common/asprintf.h"
 #include "common/options.h"
 #include <stdio.h>

src/server/slave.c

➞

Show inline comments

@@ @@ -15,12 +15,14 @@ @@
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "slavefuncs.h"
 #include "common/asprintf.h"
 #include "common/multiio.h"
 #include "common/options.h"
 #include "common/protocol.h"

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -14,12 +14,14 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "distrenjob.h"
 #include "slavefuncs.h"
 #include "common/asprintf.h"
 #include "common/execio.h"
 #include "common/protocol.h"

src/server/tabletennis.c

➞

Show inline comments

@@ @@ -14,12 +14,14 @@ @@
  * GNU Affero General Public License for more details.
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "common/config.h"
 #include "distrend.h"
 #include "listen.h"
 #include "tabletennis.h"
 #include "common/request.h"
 #include "common/protocol.h"

src/server/user_mgr.c

➞

Show inline comments

@@ @@ -14,25 +14,26 @@ @@
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "common/config.h"
 #include "user_mgr.h"
 #include "common/asprintf.h"
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include <libxml/xmlreader.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
@@ @@ -77,14 +78,16 @@ int resize_user_array() @@
 struct user *findUser(char *nameOfUser)
+{
 	int high;
 	int low;
 	int middle;
 	int result;
 	high = user_mgr_info.user_array_size - 1;
 	low = 0;
 	result = -1;
 	for(middle = (low+high)/2; 1 == 1; middle = (low+high)/2)
+	{
 		// in case middle lands on a part of the array with no user
 		while(user_mgr_info.user_array[middle].username == 0)
+		{
@@ @@ -139,12 +142,14 @@ int createUser(struct user *user_ptr, ch @@
 int placeUser(int index, char *nameOfUser)
+{
 	int higher;
 	int lower;
 	int total_moves;
 	total_moves = 0;
 	// I shift data in the array to create an open the space where the user should be added
 	// but first I figure out which way is the shortest
 	if(user_mgr_info.user_array[index].username != 0)
+	{
 		higher = index + 1;
 		while(user_mgr_info.user_array[higher].username != 0)
@@ @@ -169,26 +174,28 @@ int placeUser(int index, char *nameOfUse @@
+		  }
+	}
 	// add the user to the array
 	createUser(&user_mgr_info.user_array[index], nameOfUser);
-	if(total_moves > 50){
 	if(total_moves > 50)
 	  resize_user_array();
+	}
 	return 1;
+}
 int addUser(char *nameOfUser)
+{
 	int high;
 	int low;
 	int middle;
 	int result;
 	high = user_mgr_info.user_array_size - 1;
 	low = 0;
 	result = -1;
 	for(middle = (low+high)/2; 1 == 1; middle = (low+high)/2)
+	{
 		// in case middle lands on a part of the array with no user
 		while(user_mgr_info.user_array[middle].username == 0)
+		{

0 comments (0 inline, 0 general)