DistRen Changeset - ac130e840b4b · protofusion repositories

Changeset - ac130e840b4b

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-03-13 22:19:53
e@ethanzonca.com

Added basic getwork to simpleslave

3 files changed with 27 insertions and 7 deletions:

Makefile.am

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

Makefile.am

➞

Show inline comments

 ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' \
 	-DLOCALSTATEDIR='"$(localstatedir)"' \
 	-I$(top_srcdir)/src
 AM_CFLAGS = $(DISTLIBS_CFLAGS)
 LIBS = $(DISTLIBS_LDADD) $(DISTLIBS_LDFLAGS)
 LDADD = libdistrencommon.la
 bin_PROGRAMS =
 if ENABLE_SERVER
 bin_PROGRAMS += distrend distrenslave
+bin_PROGRAMS += distrend distrenslave distrensimpleslave
 endif
 pkglib_LTLIBRARIES = libdistrencommon.la
 # libdistrencommon.la:
 libdistrencommon_la_SOURCES = src/common/asprintf.c src/common/asprintf.h \
 	src/common/execio.c src/common/execio.h \
 	src/common/misc.c src/common/misc.h \
 	src/common/options.c src/common/options.h \
 	src/common/protocol.h \
 	src/common/remoteio.h \
 	src/common/remoteio.c src/common/libremoteio.h
@@ @@ -38,28 +38,31 @@ distrend_LDFLAGS = $(AM_LDFLAGS) $(MYSQL @@
 distrend_SOURCES = $(SERVER_SOURCES) \
 	src/server/distrend.c \
 	src/server/distrend.h \
 	src/server/user_mgr.c \
 	src/server/user_mgr.h \
 	src/server/listen.h \
 	src/server/listen.c \
 	src/server/mysql.h \
 	src/server/mysql.c
 distrend_LDADD = libdistrencommon.la
 # distrenslave:
 distrenslave_SOURCES = $(SERVER_SOURCES) \
 	src/server/slave.c \
 	src/server/simpleslave.c
 	src/server/slave.c
 distrenslave_LDADD = libdistrencommon.la
 # distrensimpleslave:
 distrensimpleslave_SOURCES = $(SERVER_SOURCES) \
         src/server/simpleslave.c
 distrensimpleslave_LDADD = libdistrencommon.la
 # configuration files:
 dist_sysconf_DATA = etc/distrencommon.conf
 nodist_sysconf_DATA = etc/distrendaemon.conf \
 	etc/distrenslave.conf
 EXTRA_DIST = etc/distrendaemon.conf.in \
 	etc/distrenslave.conf.in
 # tests
 TESTS=test/check_execio test/check_asprintf

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -587,25 +587,25 @@ static size_t _web_writememorycallback(v @@
   struct _web_memorystruct *mem = (struct _web_memorystruct *)data;
   mem->memory = _web_myrealloc(mem->memory, mem->size + realsize + 1);
   if (mem->memory) {
     memcpy(&(mem->memory[mem->size]), ptr, realsize);
     mem->size += realsize;
     mem->memory[mem->size] = 0;
+  }
   return realsize;
+}
 struct _web_memorystruct _web_getrequest(char *url){
   fprintf(stderr,"Preparing to get request at %s",url);
+  // fprintf(stderr,"Preparing to get request at %s",url);
   CURL *curl;
   CURLcode res;
   struct _web_memorystruct chunk;
   chunk.memory=NULL; /* we expect realloc(NULL, size) to work */
   chunk.size = 0;    /* no data at this point */
   curl = curl_easy_init();
   if(curl) {
     curl_easy_setopt(curl, CURLOPT_URL, url);
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, _web_writememorycallback);
@@ @@ -618,31 +618,48 @@ struct _web_memorystruct _web_getrequest @@
   /* we're done with libcurl, so clean it up */
   curl_global_cleanup();
   return chunk; // 0 is OK, 1 is 404 or other error
+}
 void _web_finishframe(int slavekey, char *slavepass, int jobnum, int framenum){
   char *url;
   _distren_asprintf(&url,"http://dev.distren.org/slave/act.php?mode=finishframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum);
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
   fprintf(stderr,"Got data: %s\n", data.memory);
   if(data.memory)
     free(data.memory);
+}
 void _web_startframe(int slavekey, char *slavepass, int jobnum, int framenum){
+}
 void _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum){
 int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum){
   char *url;
   _distren_asprintf(&url,"http://dev.distren.org/slave/act.php?mode=getwork&slavekey=%d&slavepass=%s", slavekey, slavepass);
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
   //fprintf(stderr,"Got data for getwork: %s!\n", data.memory);
   if(!strcmp(data.memory, "ERROR_BADKEY")){
     fprintf(stderr,"*** Slave %d does not exist!\n",slavekey);
     free(data.memory);
     return 0;
+  }
   else{
     *jobnum = atoi(data.memory);
     *framenum = atoi(strchr(data.memory, ',') + 1);
     free(data.memory);
     return 1;
+  }
+}
 void _web_setrenderpower(int slavekey, char *slavepass, int jobnum, int framenum){
+}

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -51,17 +51,17 @@ int uploadOutput(char *pathtoOutput, cha @@
 int unpackJob(char *pathtoTar, int jobnum);
 void prepareJobPaths(int jobnum, int framenum, char *outputExt, char *datadir, char **urltoTar,char **pathtoTar,char **pathtoJobfile,char **urltoOutput,char **pathtoOutput);
 int checkUsername(char *username);
 void slaveTest();
 /* Simple slave */
 struct _web_memorystruct;
 static void *_web_myrealloc(void *ptr, size_t size);
 static size_t _web_writememorycallback(void *ptr, size_t size, size_t nmemb, void *data);
 struct _web_memorystruct _web_getrequest(char *url);
 void _web_finishframe(int slavekey, char *slavepass, int jobnum, int framenum);
 void _web_startframe(int slavekey, char *slavepass, int jobnum, int framenum);
-void _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum);
+int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum);
 void _web_setrenderpower(int slavekey, char *slavepass, int jobnum, int framenum);
 #endif

0 comments (0 inline, 0 general)