DistRen Changeset - 627c64f1fd14 · protofusion repositories

Changeset - 627c64f1fd14

Parent rev.

Child rev.

[Not reviewed]

default

0 5 1

Nathan Brink (binki) - 17 years ago 2009-02-20 23:50:42
ohnobinki@ohnopublishing.net

fixed most warnings, fixed some automake stuff, moved some blender code to another file

6 files changed with 78 insertions and 46 deletions:

src/client/Makefile.am

src/client/blender.c

src/client/distren.c

src/common/options.c

src/server/Makefile.am

src/server/distrend.c

0 comments (0 inline, 0 general)

src/client/Makefile.am

➞

Show inline comments

 bin_PROGRAMS = distren
 distren_SOURCES = distren.c
 distren_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistren.la
-distren_CXXFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common
+distren_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common

src/client/blender.c

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright 2008 Nathan Phillip Brink, Ethan Zonca, Matt Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   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 <stdio.h> /* sprintf, printf */
 #include <stdlib.h> /* malloc, free */
 #include <string.h> /* strlen */
 int blend()
+{
   char *blendercmd;
   char *filename = "file.blend";  /* declares a variable to hold the file name */
   char *format = "blender.exe -b \"%s\" -o //tmp/frame -f %d -F JPEG -x 1"; /* the format string to pass to sprintf */
   unsigned int frame_to_render;
   size_t blenderstrlen;
   int toreturn;
   //just prove that linking to the shared lib werkz
   genericfunc();
   execlisten();
   // blender =   // gets blender structure from server
   /*-- blender structure--
    * file_name
    * frame_to_render
    * url to dl .blend file
    */
   frame_to_render = 10; // temporary, the number 10 will be replaced with a function call
   // file_name = job.file_name // retrieves file name from the blender structure ?
   blenderstrlen = strlen(format) - 2 * 2 /* format string minus placeholders */ + strlen(filename) + intstrlen(frame_to_render) + 1 /* NULL terminator */;
   blendercmd = malloc(blenderstrlen);
   snprintf(blendercmd, blenderstrlen, format, filename, frame_to_render);
   fprintf(stderr, "will run ``%s''\n", blendercmd);
   toreturn = system(blendercmd);
   free(blendercmd);
   return toreturn;
+}

src/client/distren.c

➞

Show inline comments

 /*
   Copyright 2008 Nathan Phillip Brink, Ethan Zonca, Matt Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   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 <stdio.h> /* sprintf, printf */
 #include <stdlib.h> /* malloc, free */
 #include <string.h> /* strlen */
 #include "options.h"
 int main(int argc, char *argv[])
+{
   return 0;
 };
 /* this function should probably not exist. asprintf should be used instead of sprintf */
 size_t intstrlen(size_t theint)
+{
   size_t len = 0; /* if the number is single digit, this will be incremented */
   do
+    {
       theint /= 10;
       len ++;
+    }
   while(theint > 0);
   return len;
+}
 int main(int argc, char *argv[])
+{
   char *blendercmd;
   char *filename = "file.blend";  /* declares a variable to hold the file name */
   char *format = "blender.exe -b \"%s\" -o //tmp/frame -f %d -F JPEG -x 1"; /* the format string to pass to sprintf */
   unsigned int frame_to_render;
   size_t blenderstrlen;
   int toreturn;
   //just prove that linking to the shared lib werkz
   genericfunc();
   execlisten();
   // blender =   // gets blender structure from server
   /*-- blender structure--
    * file_name
    * frame_to_render
    * url to dl .blend file
    */
   frame_to_render = 10; // temporary, the number 10 will be replaced with a function call
   // file_name = job.file_name // retrieves file name from the blender structure ?
   blenderstrlen = strlen(format) - 2 * 2 /* format string minus placeholders */ + strlen(filename) + intstrlen(frame_to_render) + 1 /* NULL terminator */;
   blendercmd = malloc(blenderstrlen);
   snprintf(blendercmd, blenderstrlen, format, filename, frame_to_render);
   fprintf(stderr, "will run ``%s''\n", blendercmd);
   toreturn = system(blendercmd);
   free(blendercmd);
   return toreturn;
+}

src/common/options.c

➞

Show inline comments

 /*
   Copyright 2008 Nathan Phillip Brink, Ethan Zonca
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   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 "options.h"
 #include <confuse.h>
 int execlisten()
+{
 	/* execlp("ssh", somethingness ) 0); */
+  return 0;
+}
 int genericfunc()
+{
   /* Conf File Parser */
     cfg_opt_t opts[] =
+    {
         CFG_STR("test", "mneh", CFGF_NONE),
         CFG_END()
      };
        cfg_t *cfg;
        cfg = cfg_init(opts, CFGF_NONE);
        if(cfg_parse(cfg, "distren.conf") == CFG_PARSE_ERROR)
            return 1;
 /* End Conf File Parser */
   cfg_free(cfg);
        cfg = cfg_init(opts, CFGF_NONE);
        if(cfg_parse(cfg, "distrend.conf") == CFG_PARSE_ERROR)
            return 1;
 /* End Conf File Parser */
 printf("Conf File Test", cfg_getstr(cfg, "test"));
+       printf("Conf File Test: %s\n", cfg_getstr(cfg, "test"));
   cfg_free(cfg);
   return 0;
+}

src/server/Makefile.am

➞

Show inline comments

 bin_PROGRAMS = distrend
 distrend_SOURCES = distrend.c
 distrend_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistren.la
-distrend_CXXFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common
+distrend_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common

src/server/distrend.c

➞

Show inline comments

 /*
   Copyright 2008 Nathan Phillip Brink, Ethan Zonca
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   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/>.
   -- Blender Commands --
   -v "Print Blender version and exit"
   -F <format> "Set the render format" Valid options are (that we care about) "TGA, JPG, MOVIE, AVIRAW, AVIJPG, PNG, BMP, FRAMESERVER"
   -S <name> Set scene <name>
   -f <frame> Render frame <frame> and save it
   -s <frame> Set start frame (use before -a argument)
   -e <frame> Set end frame (use before -a argument>
   -o <path> Set the render path and file name (use // at start of the path to render relative to the blend file, the ### characters are replaced by the frame number)
   -t <threads> Use amount of ,threads> for rendering (background mode only)(1-8, 0 for systems processor count)
   -x <bool> Set option to add the file extension to the end of the file
 */
 #include <stdio.h>
 // Let's fix those global variable issues one of these days! :D test
 int main(int argc, char *argv[])
+{
   return 0;
+}
 struct blender_job_server // will be stored and edited in the blender_job_que
+{
 	char file_name[25];
 	int start_frame;
 	int end_frame;
 };
 struct blender_job_client // will be sent to the client
+{
 	char file_name[25];
 	int current_frame;
 };
 blender_text_job_parser()
+void blender_text_job_parser()
+{
 // parse text or other file for job specifications which include:
 // file_name, start_frame, and end_frame
+}
 blendere_job_que(int x, char job_to_edit[25])
+void blendere_job_que(int x, char job_to_edit[25])
+{
 	struct blender_job_server job[10]; // creates array to store the job
 	if (x == 0)
+	{
 		// add new job (job_to_edit)
+	}
 	if (x == 1)
+	{
 		// delete job (job_to_edit)
+	}
 	if (x == 1)
+	{
 		// move all jobs up one position in array
+	}
+}

0 comments (0 inline, 0 general)