DistRen Changeset - 83227db1cee8 · protofusion repositories

Changeset - 83227db1cee8

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-07-09 01:27:24
ohnobinki@ohnopublishing.net

fixed some basic confuse arrays, fixed #include order

1 file changed with 15 insertions and 10 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -18,28 +18,29 @@ @@
 */
 /* 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. */
  /* Just some notes -- Ethan Zonca
  * ++ Make data availible for other apps to parse
  * Server<==>Client Communication
  * Upload while rendering
  */
 #include <stdio.h>
 #include "execio.h"
 #include "options.h"
 #include <confuse.h>
 #include <stdio.h>
 #include <malloc.h>
 #define MAX_BLENDJOBS 100 // maximum number of stored jobs in memory, per job type (lux/blend). Eventually we can dump this data to disk, or atleast the remainder not in memory...
 // Global Vars, try to cut down on these
 int jobnum = 0; // The next job number to create in the queue
 int hcfjob; // Highest consecutively finished job
 int highest_jobnum; // The job number of the most recently created job, this is used when creating new jobs
 /* ******************* Structs ************************ */
 // Stores config info? editmycomment
 struct distrend_config
@@ @@ -103,56 +104,60 @@ jobnum++; // Advance the jobnumber for t @@
 /* ************************** Main ************************* */
 int main(int argc, char *argv[])
+{
 // Begin non-working framework?
 	int distrend_do_config(int argc, char *argv[], struct distrend_config *config)
+	{
 	  cfg_opt_t myopts =
+	    {
 	      CFG_SEC("listen",  /* this must be imported into struct listens (which must still be declared) */
 	  cfg_opt_t myopts_listen[] =
+	    {
 	      CFG_SIMPLE_STR("type", NULL),
 		CFG_SIMPLE_STR("path", NULL),
 		CFG_SIMPLE_INT("port", NULL)
 		},
 	      CFG_SIMPLE_STR("path", NULL),
 	      CFG_SIMPLE_INT("port", NULL),
 	      CFG_END()
 	  };
 	  cfg_opt_t myopts[] =
+	    {
 	      CFG_SEC("listen",  /* this must be imported into struct listens (which must still be declared) */
 		      myopts_listen
+		      ,
 		      CFGF_MULTI),
 	      CFG_END
+	      CFG_END()
 	    };
 	  config = malloc(sizeof(struct distrend_config));
-	  options_init(argc, argv, &config->mycfg, &myopts, "server", &config->options);
 	  options_init(argc, argv, &config->mycfg, myopts, "server", &config->options);
 	  return 0;
+	}
 	int distrend_config_free(struct distrend_config *config)
+	{
 	  options_free(config->options);
 	  free(config);
 	  return 0;
+	}
 // End non-working framework?
   int cont = 1;
   struct distrend_listenset *listenset;
   struct distrend_config *config;
-  distrend_do_config(argc, argv, &config);
   distrend_do_config(argc, argv, config);
   distrend_listen(&listenset, config);
   /* This is called the ``main loop'' */
   while(cont)
+    {
       struct distren_action *action;
       distrend_accept(&action);
       cont = distrend_do(action);
       distrend_action_free(action);
+    }

0 comments (0 inline, 0 general)