diff --git a/checkin_notes b/checkin_notes index b5773f0a1b..70bb34a323 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9113,3 +9113,12 @@ David 17 Dec 2011 sched/ sched_types.h sched_version.cpp + +David 19 Dec 2011 + - vboxwrapper: if shared dir is specified and it doesn't exist on startup, + that's not necessarily an error. + Try to create it. + If it exists and is a file, show appropriate error message. + + samples/vboxwrapper/ + vboxwrapper.cpp diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp index a33ed210ea..bd7401c2c4 100644 --- a/samples/vboxwrapper/vboxwrapper.cpp +++ b/samples/vboxwrapper/vboxwrapper.cpp @@ -26,8 +26,6 @@ // - suspend/resume/quit/abort // - reporting CPU time // - loss of heartbeat from core client -// - checkpointing -// (at the level of task; or potentially within task) // // Contributors: // Andrew J. Younge (ajy4490 AT umiacs DOT umd DOT edu) @@ -211,17 +209,25 @@ int main(int argc, char** argv) { } // Validate whatever configuration options we can + // if (vm.enable_shared_directory) { - if (!is_dir("shared")) { - fprintf( - stderr, - "%s vbox_job.xml specifies that the shared directory should be enabled, but the\n" - "%s 'shared' subdirectory could not be found. Please check your app_version and verify\n" - "%s that the element has been specified.\n", - boinc_msg_prefix(buf, sizeof(buf)), - boinc_msg_prefix(buf, sizeof(buf)), - boinc_msg_prefix(buf, sizeof(buf)) - ); + if (boinc_file_exists("shared")) { + if (!is_dir("shared")) { + fprintf( + stderr, + "%s 'shared' exists but is not a directory.\n", + boinc_msg_prefix(buf, sizeof(buf)) + ); + } + } else { + retval = boinc_mkdir("shared"); + if (retval) { + fprintf(stderr, + "%s couldn't created shared directory: %s.\n", + boinc_msg_prefix(buf, sizeof(buf)), + boincerror(retval) + ); + } } }