*** empty log message ***

svn path=/trunk/boinc/; revision=3998

sched/Makefile.am

@@ -16,6 +16,10 @@ noinst_PROGRAMS =                               \
     sample_dummy_assimilator                    \
     sample_bitwise_validator                    \
     sample_trivial_validator                    \
+    get_file					\
+    send_file					\
+    request_file_list				\
+    delete_file					\
     wu_check
 
 noinst_LIBRARIES = libsched.a
@@ -104,6 +108,22 @@ message_handler_SOURCES = message_handler.C
 message_handler_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
 message_handler_LDADD = $(LDADD) $(RSA_LIBS)
 
+request_file_list_SOURCES = request_file_list.C
+request_file_list_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
+request_file_list_LDADD = $(LDADD) $(RSA_LIBS)
+
+get_file_SOURCES = get_file.C
+get_file_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
+get_file_LDADD = $(LDADD) $(RSA_LIBS)
+
+send_file_SOURCES = send_file.C
+send_file_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
+send_file_LDADD = $(LDADD) $(RSA_LIBS)
+
+delete_file_SOURCES = delete_file.C
+delete_file_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
+delete_file_LDADD = $(LDADD) $(RSA_LIBS)
+
 fcgi_SOURCES =                                  \
     handle_request.C                            \
     main.C                                      \

sched/delete_file.C

@@ -0,0 +1,114 @@
+// The contents of this file are subject to the BOINC Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://boinc.berkeley.edu/license_1.0.txt
+//
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License.
+//
+// The Original Code is the Berkeley Open Infrastructure for Network Computing.
+//
+// The Initial Developer of the Original Code is the SETI@home project.
+// Portions created by the SETI@home project are Copyright (C) 2002
+// University of California at Berkeley. All Rights Reserved.
+//
+// Contributor(s):
+//
+
+//------------------------------------
+//
+// delete_file         [-host_id host_id -file_name file_name]
+// -host_id            number of host to upload from
+//                     or 'all' if for all active hosts
+// -file_name          name of the file to delete
+//
+// Create a msg_to_host_that requests that the host delete the
+// given file from the client
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#include "boinc_db.h"
+#include "sched_config.h"
+#include "sched_util.h"
+
+SCHED_CONFIG config;
+
+int delete_host_file(int host_id, const char* file_name) {
+    DB_MSG_TO_HOST mth;
+    char msg_text[400];
+    sprintf(msg_text, "<delete_file_info>%s</delete_file_info>\n", file_name);
+    int retval;
+    mth.clear();
+    mth.create_time = time(0);
+    mth.hostid = host_id;
+    strcpy(mth.variety, msg_text);
+    mth.handled = false;
+    retval = mth.insert();
+    if (retval) {
+        fprintf(stderr, "msg_to_host.insert(): %d\n", retval);
+        return retval;
+    }
+    return 0;
+}
+
+int main(int argc, char** argv) {
+    int i, retval;
+    char file_name[256];
+    int host_id;
+
+    host_id = 0;
+    strcpy(file_name, "");
+
+    check_stop_daemons();
+
+    // get arguments
+    for(i=1; i<argc; i++) {
+        if (!strcmp(argv[i], "-host_id")) {
+            if(!strcmp(argv[++i], "all")) {
+                host_id = 0;
+            } else {
+                host_id = atoi(argv[i]);
+            }
+        } else if(!strcmp(argv[i], "-file_name")) {
+            strcpy(file_name, argv[i++]);
+        } else {
+            if (!strncmp("-",argv[i],1)) {
+                fprintf(stderr, "request_file_list: bad argument '%s'\n", argv[i]);
+                exit(1);
+            }
+        }
+    }
+
+    // if no arguments are given, error and exit
+    if (!strlen(file_name) || host_id == 0) {
+        fprintf(stderr, "request_file_list: bad command line, requires a valid host_id and file_name\n");
+        exit(1);
+    }
+
+    // parse the configuration file to get database information
+    retval = config.parse_file("..");
+    if (retval) {
+        fprintf(stderr, "Can't parse config file: %d\n", retval);
+        exit(1);
+    }
+
+    // open the database
+    retval = boinc_db.open(config.db_name, config.db_host, config.db_user, config.db_passwd);
+    if (retval) {
+        fprintf(stderr, "boinc_db.open failed: %d\n", retval);
+        exit(1);
+    }
+
+    // run the get file routine
+    retval = delete_host_file(host_id, file_name);
+    // close the database
+    boinc_db.close();
+    // return with error code if any
+    return retval;
+}

sched/get_file.C

@@ -0,0 +1,199 @@
+// The contents of this file are subject to the BOINC Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://boinc.berkeley.edu/license_1.0.txt
+//
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License.
+//
+// The Original Code is the Berkeley Open Infrastructure for Network Computing.
+//
+// The Initial Developer of the Original Code is the SETI@home project.
+// Portions created by the SETI@home project are Copyright (C) 2002
+// University of California at Berkeley. All Rights Reserved.
+//
+// Contributor(s):
+//
+
+//------------------------------------
+//
+// get_file [-host_id host_id] [-file_name file_name]
+// -host_id            name of host to upload from
+// -file_name          name of specific file, dominates workunit
+//
+// Create a result entries, initialized to sent, and corresponding
+// messages to the host that is assumed to have the file.
+
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#include <time.h>
+#include "boinc_db.h"
+#include "sched_config.h"
+#include "sched_util.h"
+#include "md5_file.h"
+#include "util.h"
+
+SCHED_CONFIG config;
+
+void init_xfer_result(DB_RESULT& result) {
+    result.id = 0;
+    result.create_time = time(0);
+    result.workunitid = 0;
+    result.server_state = RESULT_SERVER_STATE_IN_PROGRESS;
+    result.hostid = 0;
+    result.report_deadline = 0;
+    result.sent_time = 0;
+    result.received_time = 0;
+    result.client_state = 0;
+    result.cpu_time = 0;
+    strcpy(result.xml_doc_out, "");
+    strcpy(result.stderr_out, "");
+    result.outcome = RESULT_OUTCOME_INIT;
+    result.file_delete_state = ASSIMILATE_DONE;
+    result.validate_state = VALIDATE_STATE_NO_CHECK;
+    result.claimed_credit = 0;
+    result.granted_credit = 0;
+    result.appid = 0;
+}
+
+int create_upload_result(DB_RESULT& result, int host_id, const char * file_name) {
+    int retval;
+    char result_xml[LARGE_BLOB_SIZE];
+    sprintf(result_xml,
+            "<result>\n"
+            "    <wu_name>%s</wu_name>\n"
+            "    <name>%s</wu_name>\n"
+            "    <file_ref>\n"
+            "      <file_name>%s</file_name>\n"
+            "    </file_ref>\n"
+            "</result>\n",
+            result.name, result.name, file_name);
+    strcpy(result.xml_doc_in, result_xml);
+    result.sent_time = time(0);
+    result.report_deadline = 0;
+    result.hostid = host_id;
+    retval = result.insert();
+    if (retval) {
+        fprintf(stderr, "result.insert(): %d\n", retval);
+        return retval;
+    }
+    return 0;
+}
+
+int create_upload_message(DB_RESULT& result, int host_id, const char* file_name) {;
+    DB_MSG_TO_HOST mth;
+    int retval;
+    mth.clear();
+    mth.create_time = time(0);
+    mth.hostid = host_id;
+    strcpy(mth.variety, "file_xfer");
+    mth.handled = false;
+    sprintf(mth.xml,
+            "<app>\n"
+            "    <name>%s</name>\n"
+            "</app>\n"
+            "<app_version>\n"
+            "    <app_name>%s</app_name>\n"
+            "    <version_num>%d00</version_num>\n"
+            "</app_version>\n"
+            "<file_info>\n"
+            "    <name>%s</name>\n"
+            "    <url>%s</url>\n"
+            "    <max_nbytes>%.0f</max_nbytes>\n"
+            "    <upload_when_present/>\n"
+            "</file_info>\n"
+            "%s"
+            "<workunit>\n"
+            "    <name>%s</name>\n"
+            "    <app_name>%s</app_name>\n"
+            "</workunit>",
+            FILE_MOVER, FILE_MOVER, BOINC_MAJOR_VERSION, file_name, config.upload_url,
+            1e10, result.xml_doc_in, result.name, FILE_MOVER);
+    retval = mth.insert();
+    if (retval) {
+        fprintf(stderr, "msg_to_host.insert(): %d\n", retval);
+        return retval;
+    }
+    return 0;
+}
+
+int get_file(int host_id, const char* file_name) {
+    DB_RESULT result;
+    long int my_time = time(0);
+    int retval;
+    result.clear();
+    init_xfer_result(result);
+    sprintf(result.name, "get_%s_%d_%ld", file_name, host_id, my_time);
+    result.hostid = host_id;
+    retval = create_upload_result(result, host_id, file_name);
+    retval = create_upload_message(result, host_id, file_name);
+    return retval;
+}
+
+
+int main(int argc, char** argv) {
+    int i, retval;
+    char file_name[256];
+    int host_id;
+
+    // initialize argument strings to empty
+    strcpy(file_name, "");
+    host_id = 0;
+
+    check_stop_daemons();
+
+    // get arguments
+    for(i=1; i<argc; i++) {
+        if (!strcmp(argv[i], "-host_id")) {
+            host_id = atoi(argv[++i]);
+        } else if (!strcmp(argv[i], "-file_name")) {
+            strcpy(file_name, argv[++i]);
+        } else if (!strcmp(argv[i], "-help")) {
+            fprintf(stdout,
+                    "get_file: gets a file to a specific host\n\n",
+                    "It takes the following arguments and types:\n",
+                    "-hostid (int); the number of the host\n",
+                    "-file_name (string); the name of the file to get\n");
+        } else {
+            if (!strncmp("-",argv[i],1)) {
+                fprintf(stderr, "get_file: bad argument '%s'\n", argv[i]);
+                fprintf(stderr, "type get_file -help for more information\n");
+                exit(1);
+            }
+        }
+    }
+
+    // if no arguments are given, error and exit
+    if (!strlen(file_name) || host_id == 0) {
+        fprintf(stderr, "get_file: bad command line, requires a valid host_id and file_name\n");
+        exit(1);
+    }
+
+    // parse the configuration file to get database information
+    retval = config.parse_file("..");
+    if (retval) {
+        fprintf(stderr, "Can't parse config file: %d\n", retval);
+        exit(1);
+    }
+
+    // open the database
+    retval = boinc_db.open(config.db_name, config.db_host, config.db_user, config.db_passwd);
+    if (retval) {
+        fprintf(stderr, "boinc_db.open failed: %d\n", retval);
+        exit(1);
+    }
+
+    // run the get file routine
+    retval = get_file(host_id, file_name);
+    // close the database
+    boinc_db.close();
+    // return with error code if any
+    return retval;
+}

sched/request_file_list.C

@@ -0,0 +1,120 @@
+// The contents of this file are subject to the BOINC Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://boinc.berkeley.edu/license_1.0.txt
+//
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License.
+//
+// The Original Code is the Berkeley Open Infrastructure for Network Computing.
+//
+// The Initial Developer of the Original Code is the SETI@home project.
+// Portions created by the SETI@home project are Copyright (C) 2002
+// University of California at Berkeley. All Rights Reserved.
+//
+// Contributor(s):
+//
+
+//------------------------------------
+//
+// request_file_list [-host_id host_id]
+// -host_id            number of host to upload from
+//                     or 'all' if for all active hosts
+//
+// Create a msg_to_host_that requests the list of permanant files
+// associated with the project
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#include "boinc_db.h"
+#include "sched_config.h"
+#include "sched_util.h"
+
+SCHED_CONFIG config;
+
+int request_file_list(int host_id) {
+    DB_MSG_TO_HOST mth;
+    int retval;
+    mth.clear();
+    mth.create_time = time(0);
+    mth.hostid = host_id;
+    strcpy(mth.variety, "request_file_list");
+    mth.handled = false;
+    strcpy(mth.xml, "<request_file_list/>");
+    retval = mth.insert();
+    if (retval) {
+        fprintf(stderr, "msg_to_host.insert(): %d\n", retval);
+        return retval;
+    }
+    return 0;
+}
+
+int request_files_from_all() {
+    DB_HOST host;
+    while(!host.enumerate()) {
+        request_file_list(host.get_id());
+    }
+    return 0;
+}
+
+int main(int argc, char** argv) {
+    int i, retval;
+    int host_id;
+
+    host_id = 0;
+
+    check_stop_daemons();
+
+    // get arguments
+    for(i=1; i<argc; i++) {
+        if (!strcmp(argv[i], "-host_id")) {
+            if(!strcmp(argv[++i], "all")) {
+                host_id = 0;
+            } else {
+                host_id = atoi(argv[i]);
+            }
+        } else {
+            if (!strncmp("-",argv[i],1)) {
+                fprintf(stderr, "request_file_list: bad argument '%s'\n", argv[i]);
+                exit(1);
+            }
+        }
+    }
+
+    // if no arguments are given, error and exit
+    if (host_id == 0) {
+        fprintf(stderr, "request_file_list: bad command line, requires a valid host_id\n");
+        exit(1);
+    }
+
+    // parse the configuration file to get database information
+    retval = config.parse_file("..");
+    if (retval) {
+        fprintf(stderr, "Can't parse config file: %d\n", retval);
+        exit(1);
+    }
+
+    // open the database
+    retval = boinc_db.open(config.db_name, config.db_host, config.db_user, config.db_passwd);
+    if (retval) {
+        fprintf(stderr, "boinc_db.open failed: %d\n", retval);
+        exit(1);
+    }
+
+    // run the get file routine
+    if(host_id == 0) {
+        retval = request_files_from_all();
+    } else {
+        retval = request_file_list(host_id);
+    }
+    // close the database
+    boinc_db.close();
+    // return with error code if any
+    return retval;
+}

sched/sched_config.C

@@ -66,6 +66,15 @@ int SCHED_CONFIG::parse(char* buf) {
     if (match_tag(buf, "<ignore_upload_certificates/>")) {
         ignore_upload_certificates = true;
     }
+    if (match_tag(buf, "<deletion_policy_priority/>")) {
+        deletion_policy_priority = true;
+    }
+    if (match_tag(buf, "<deletion_policy_expire/>")) {
+        deletion_policy_expire = true;
+    }
+    if (match_tag(buf, "<delete_from_self/>")) {
+        delete_from_self = true;
+    }
     if (match_tag(buf, "<enforce_delay_bound/>")) {
         enforce_delay_bound = true;
     }

sched/send_file.C

@@ -0,0 +1,225 @@
+// The contents of this file are subject to the BOINC Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// http://boinc.berkeley.edu/license_1.0.txt
+//
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+// License for the specific language governing rights and limitations
+// under the License.
+//
+// The Original Code is the Berkeley Open Infrastructure for Network Computing.
+//
+// The Initial Developer of the Original Code is the SETI@home project.
+// Portions created by the SETI@home project are Copyright (C) 2002
+// University of California at Berkeley. All Rights Reserved.
+//
+// Contributor(s):
+//
+
+//------------------------------------
+//
+// send_file [-host_id host_id] [-file_name file_name] [-num_copies]
+// -host_id            name of host to upload from
+// -file_name          name of specific file, dominates workunit
+//
+// Create a result entries, initialized to sent, and corresponding
+// messages to the get the files.
+
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#include <time.h>
+#include "boinc_db.h"
+#include "sched_config.h"
+#include "sched_util.h"
+#include "md5_file.h"
+#include "util.h"
+
+SCHED_CONFIG config;
+
+void init_xfer_result(DB_RESULT& result) {
+    result.id = 0;
+    result.create_time = time(0);
+    result.workunitid = 0;
+    result.server_state = RESULT_SERVER_STATE_IN_PROGRESS;
+    result.hostid = 0;
+    result.report_deadline = 0;
+    result.sent_time = 0;
+    result.received_time = 0;
+    result.client_state = 0;
+    result.cpu_time = 0;
+    strcpy(result.xml_doc_out, "");
+    strcpy(result.stderr_out, "");
+    result.outcome = RESULT_OUTCOME_INIT;
+    result.file_delete_state = ASSIMILATE_DONE;
+    result.validate_state = VALIDATE_STATE_NO_CHECK;
+    result.claimed_credit = 0;
+    result.granted_credit = 0;
+    result.appid = 0;
+}
+
+int create_download_result(DB_RESULT& result, int host_id) {
+    int retval;
+    char result_xml[LARGE_BLOB_SIZE];
+    sprintf(result_xml,
+            "<result>\n"
+            "    <wu_name>%s</wu_name>\n"
+            "    <name>%s</name>\n"
+            "</result>\n",
+            result.name, result.name);
+    strcpy(result.xml_doc_in, result_xml);
+    result.sent_time = time(0);
+    result.report_deadline = 0;
+    result.hostid = host_id;
+    retval = result.insert();
+    if (retval) {
+        fprintf(stderr, "result.insert(): %d\n", retval);
+        return retval;
+    }
+    return 0;
+}
+
+int create_download_message(DB_RESULT& result, int host_id, const char* file_name, int priority, unsigned long exp_days) {;
+    DB_MSG_TO_HOST mth;
+    int retval;
+    double nbytes;
+    char dirpath[256], urlpath[256], path[256], md5[33];
+    dirpath = config.download_dir;
+    urlpath = config.download_url;
+    mth.clear();
+    mth.create_time = time(0);
+    mth.hostid = host_id;
+    strcpy(mth.variety, "file_xfer");
+    mth.handled = false;
+    sprintf(path, "%s/%s", dirpath, file_name);
+    retval = md5_file(path, md5, nbytes);
+    if (retval) {
+        fprintf(stderr, "process_wu_template: md5_file %d\n", retval);
+        return retval;
+    }
+    sprintf(mth.xml,
+            "<app>\n"
+            "    <name>%s</name>\n"
+            "</app>\n"
+            "<app_version>\n"
+            "    <app_name>%s</app_name>\n"
+            "    <version_num>%d00</version_num>\n"
+            "</app_version>\n"
+            "%s"
+             "<file_info>\n"
+            "    <name>%s</name>\n"
+            "    <url>%s/%s</url>\n"
+            "    <md5_cksum>%s</md5_cksum>\n"
+            "    <nbytes>%.0f</nbytes>\n"
+            "    <sticky/>\n"
+            "    <priority>%d</priority>\n"
+            "    <exp_days>%d</exp_days>\n"
+            "</file_info>\n"
+            "<workunit>\n"
+            "    <name>%s</name>\n"
+            "    <app_name>%s</app_name>\n"
+            "    <file_ref>\n"
+            "      <file_name>%s</file_name>\n"
+            "    </file_ref>\n"
+            "</workunit>",
+            FILE_MOVER, FILE_MOVER, BOINC_MAJOR_VERSION, result.xml_doc_in,
+            file_name, urlpath, file_name, md5,
+            nbytes, priority, exp_days, result.name, FILE_MOVER, file_name);
+    retval = mth.insert();
+    if (retval) {
+        fprintf(stderr, "msg_to_host.insert(): %d\n", retval);
+        return retval;
+    }
+    return 0;
+}
+
+int send_file(int host_id, const char* file_name, int priority, unsigned long exp_date) {
+    DB_RESULT result;
+    int retval;
+    result.clear();
+    long int my_time = time(0);
+    init_xfer_result(result);
+    sprintf(result.name, "send_%s_%d_%ul", file_name, host_id, my_time);
+    result.hostid = host_id;
+    retval = create_download_result(result, host_id);
+    retval = create_download_message(result, host_id, file_name, priority, exp_date);
+    return retval;
+}
+
+
+int main(int argc, char** argv) {
+    int i, retval;
+    char file_name[256];
+    int host_id;
+    int priority = 1;
+    unsigned long exp_days;
+    int num_copies;
+
+    // initialize argument strings to empty
+    strcpy(file_name, "");
+    host_id = 0;
+    num_copies = 0;
+    priority = 1;
+    exp_days = 60;
+
+    check_stop_daemons();
+
+    // get arguments
+    for(i=1; i<argc; i++) {
+        if (!strcmp(argv[i], "-host_id")) {
+            host_id = atoi(argv[++i]);
+        } else if (!strcmp(argv[i], "-file_name")) {
+            strcpy(file_name, argv[++i]);
+        } else if (!strcmp(argv[i], "-priority")) {
+            priority = atoi(argv[++i]);
+        } else if (!strcmp(argv[i], "-exp_days")) {
+            exp_days = atoi(argv[++i]);
+        } else if (!strcmp(argv[i], "-help")) {
+            fprintf(stdout,
+                    "send_file: sends a file to a specific host\n\n",
+                    "It takes the following arguments and types:\n",
+                    "-hostid (int); the number of the host\n",
+                    "-file_name (string); the name of the file to send\n",
+                    "-priority (int); the priority of the file, (low=1, high=5)\n",
+                    "-exp_days (int); the number of days until the file should expire\n");
+        } else {
+            if (!strncmp("-",argv[i],1)) {
+                fprintf(stderr, "send_file: bad argument '%s'\n", argv[i]);
+                fprintf(stderr, "type send_file -help for more information\n");
+                exit(1);
+            }
+        }
+    }
+
+    // if no arguments are given, error and exit
+    if (!strlen(file_name)) {
+        fprintf(stderr, "send_file: bad command line, requires a valid host_id and file_name\n");
+        exit(1);
+    }
+    // parse the configuration file to get database information
+    retval = config.parse_file("..");
+    if (retval) {
+        fprintf(stderr, "Can't parse config file: %d\n", retval);
+        exit(1);
+    }
+
+    // open the database
+    retval = boinc_db.open(config.db_name, config.db_host, config.db_user, config.db_passwd);
+    if (retval) {
+        fprintf(stderr, "boinc_db.open failed: %d\n", retval);
+        exit(1);
+    }
+
+    // run the get file routine
+    retval = send_file(host_id, file_name, priority, exp_days);
+
+    // close the database
+    boinc_db.close();
+    // return with error code if any
+    return retval;
+}