DistRen Changeset - 27c9b4850828 · protofusion repositories

Changeset - 27c9b4850828

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

ethanzonca - 16 years ago 2009-09-26 02:25:46

Fixed pseudo-code errors for tell_the_server

4 files changed with 5 insertions and 6 deletions:

src/server/distrend.c

src/server/slave.c

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -507,7 +507,7 @@ int main(int argc, char *argv[]) @@
 	    /* returnnum == 0 */
 	    remotio_send_to_client(frame->num, job->jobnum); // Pseudo-sends data to client
+	}
+        int clientsays = 0; // @TODO: kill me
       /* If the client states that they finished the frame */
       	if(clientsays == DISTREN_REQUEST_DONEFRAME){
       	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle

src/server/slave.c

➞

Show inline comments

@@ @@ -215,7 +215,7 @@ if(gotframe ==1) @@
     // Consider placing the following in the exec_blender() function
     while(busy == 1){
-      tell_the_server("DISTREN_REQUEST_PROGRESS");
       tell_the_server(DISTREN_REQUEST_PROGRESS);
         fprintf(stderr, "Rendering frame %d in job %d...",framenum,jobnum);
         sleep(5); // or not... this should be more event-driven, but should still give a heartbeat to the server
+      }
@@ @@ -228,8 +228,7 @@ if(gotframe ==1) @@
         char *outputurl;
         _distren_asprintf(&outputurl, "http://protofusion.org/distren/stor/job%d/",jobnum); // Aggregates the output url
         curlpost(pathtoOutput, urltoOutput); // uploads (HTML POST) the output at outputpath to the server at outputurl
         tell_the_server("DISTREN_REQUEST_DONEFRAME"
             ); // Tells the server that it's finished rendering this frame
         tell_the_server(DISTREN_REQUEST_DONEFRAME); // Tells the server that it's finished rendering this frame
         busy=0;
         // Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
+      }

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -74,7 +74,7 @@ int delete_jobdata(int jobnum, char *dat @@
+}
 /** Stub stub stubbiness ugh @TODO: Kill me. */
-void tell_the_server(char *stuff){
+void tell_the_server(int stuff){
+}
 /** Function referenced by curlget() to write data to disk. */

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -26,7 +26,7 @@ @@
 #include <stdio.h>
 xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path);
-void tell_the_server(char *stuff);
+void tell_the_server(int stuff);
 int delete_jobdata(int jobnum, char *datadir);
 size_t curl_writetodisk(void *ptr, size_t size, size_t nmemb, FILE *stream);
 int curlget(char *url, char *out);

0 comments (0 inline, 0 general)