# HG changeset patch # User normaldotcom # Date 2010-02-13 18:08:47 # Node ID e0d0a8f4daedb26cc64d82d5d27c6b267c9655d1 # Parent 37e8c7cd683a74e2bc8bfa0713fc0994909e6ec4 Commenting for queries diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -227,6 +227,7 @@ int main(int argc, char *argv[]) /* ********************** Functions ************************* */ /** Dumps all data in RAM to an xml file (such as current jobs, etc) which is parsed by start_data. Remember to invoke this before shutting down! @TODO: Fill this stub*/ +// @QUERY: Obselete function, get rid of me! int xml_dump() { return 0; @@ -242,6 +243,7 @@ int distrend_do() /** Fill variables at startup from XML dumps or defaults */ +// @QUERY: Obselete function, as data is stored in sql now. int start_data(struct general_info *general_info) { struct stat buffer; @@ -284,9 +286,9 @@ int start_data(struct general_info *gene } /** Finish-Setter: Sets a frame to the "completed" status.*/ +// @QUERY: update `distren`.`Job` set `Finish_Confirmed`=1 where `Job_Key`='1'; void finish_frame(struct general_info *geninfo, struct distrenjob *distrenjob, int frame) { - // @QUERY: update `distren`.`Job` set `Finish_Confirmed`=1 where `Job_Key`='1'; distrenjob->frameset[frame].status = FRAMESETSTATUS_DONE; distrenjob->total_render_time = distrenjob->total_render_time + (clock() - distrenjob->frameset[frame].start_time); distrenjob->completed_frames ++; @@ -301,6 +303,7 @@ void finish_frame(struct general_info *g checks to see if a job is actually done. - scans the folder of the job to make sure all output files are present */ +// @QUERY: Needs some complex query work int mortition(struct general_info *geninfo, struct distrenjob *job) { short int isJobDone; @@ -354,6 +357,7 @@ int mortition(struct general_info *genin @return 0 if the job is completely done and there are no missing frames, 1 if missing frames are found. */ +// @QUERY: Obselete with mysql job/frame storage int restoreJobState(struct distrenjob *job) { short int isJobDone; @@ -384,6 +388,7 @@ int restoreJobState(struct distrenjob *j Passed strings must be free()d by the caller. */ +// @QUERY: Likely obselete, as jobs are submitted via the web int prepare_distrenjob(struct general_info *geninfo, int type, char *name, char *submitter, int priority, int start_frame, int end_frame, int width, int height) { int counter; @@ -454,6 +459,7 @@ int prepare_distrenjob(struct general_in Adds the job to the queue based on its priority. Updates geninfo->jobs_in_queue. */ +// @QUERY: Likely obselete, enqueueing is done via web interface int distrenjob_enqueue(struct general_info *geninfo, struct distrenjob *job) { struct distrenjob *prev_job; @@ -498,8 +504,8 @@ int distrenjob_enqueue(struct general_in } /** Changes the priority of an existing (and maybe running) job. @arg head I may end up changing the head if job == head */ +// @QUERY: update `distren`.`Job` set `Priority`='12', `Finish_Confirmed`=1 where `Job_Key`='1'; int change_job_priority(struct general_info *geninfo, struct distrenjob *job, int new_priority){ - // @QUERY: update `distren`.`Job` set `Priority`='12', `Finish_Confirmed`=1 where `Job_Key`='1'; struct distrenjob *current_job; struct distrenjob *prev_job; char *serialname; @@ -546,9 +552,9 @@ int change_job_priority(struct general_i @TODO: Add calls in main() @return 0 success, other: error */ +// @QUERY: Frame_Get() int find_jobframe(struct general_info *geninfo, struct distrenjob **job, struct frameset **frame) { - // @QUERY: distren.Frame_Get() if(geninfo->hibernate) return 1; @@ -594,6 +600,7 @@ int find_jobframe(struct general_info *g return 0; } +// @QUERY: Obselete? int find_jobframe_from_job(struct distrenjob *distrenjob_ptr, struct distrenjob **job, struct frameset **frame) { unsigned int frame_counter; @@ -631,6 +638,7 @@ int find_jobframe_from_job(struct distre } // find a frame to render when the job that the last frame was for no longer exists +// @QUERY: Obselete? int find_jobframe_new(struct general_info *geninfo, int rend_pwr, struct distrenjob **job, struct frameset **frame) { if(geninfo->hibernate) @@ -682,6 +690,7 @@ int find_jobframe_new(struct general_inf } // gets a frame to render from the same job that the previously rendered frame was from +// @QUERY: Obselete? int find_jobframe_again(struct general_info *geninfo, int jobnum, int rend_pwr, struct distrenjob **job, struct frameset **frame) { if(geninfo->hibernate) @@ -746,6 +755,7 @@ void frame_watchdog(struct distrenjob *d @arg jobnum job number to search for @return NULL on job doesn't exist */ +// @QUERY: Obselete struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum) { struct distrenjob *distrenjob_ptr; @@ -769,6 +779,7 @@ struct distrenjob *distrenjob_get(struct @arg head pointer to the head of the linkedlist of distrenjobs */ +// @QUERY: Obselete: removal done via web interface void distrenjob_remove(struct general_info *geninfo, struct distrenjob *bj) { struct distrenjob *previous_distrenjob; @@ -919,6 +930,7 @@ int import_general_info(struct general_i determines path to the distenjob XML file and calls distrenjob_unserialize() */ +// @QUERY: Likely obselete (don't remove at request of ohnobinki) int restore_distrenjob(struct general_info *geninfo, struct distrenjob **distrenjob, jobnum_t jobnum) { int tmp; @@ -937,6 +949,7 @@ int restore_distrenjob(struct general_in return tmp; } +// @QUERY: Likely obselete (don't remove at request of ohnobinki) int updateJobStatsXML(struct distrenjob *job) { xmlTextWriterPtr writer; @@ -985,6 +998,7 @@ int updateJobStatsXML(struct distrenjob updates job_list.xml which lists all the jobs in the queue @return 0 means success */ +// @QUERY: Likely obselete (don't remove at request of ohnobinki) int update_xml_joblist(struct general_info *geninfo) { struct distrenjob *job; @@ -1052,6 +1066,7 @@ int update_xml_joblist(struct general_in this reads a list of jobs in the queue before DistRen was shut down and then adds the jobs to the queue, as if it were never shut down */ +// @QUERY: Likely obselete (don't remove at request of ohnobinki) int createQueueFromXML(struct general_info *geninfo) { int tmp; @@ -1111,6 +1126,7 @@ int createQueueFromXML(struct general_in with the last job in the job_list xml file to preserve the order of the queue */ +// @QUERY: Likely obselete (don't remove at request of ohnobinki) int reCreateQueueFromXML(struct general_info *geninfo, xmlDocPtr doc, xmlNodePtr current) { struct distrenjob *holder; // holds the job that "was" after head, so that the new struct can be inserted after head