Change the archive '-d' option to clean the experiment directory

before the next sync instead of immediately after creating the
archive.  Should work better when used with the '$ns report' event,
otherwise stale data gets left around.

event/sched/simulator-agent.cc

@@ -308,7 +308,7 @@ int send_report(simulator_agent_t sa, char *args)
 		file = NULL;
 	}
 
-	if ((file = popenf("loghole --port=%d --quiet archive", "r",
+	if ((file = popenf("loghole --port=%d --quiet archive --delete", "r",
 			   DEFAULT_RPC_PORT)) == NULL) {
 		strcpy(loghole_name, eid);
 		error("failed to archive log holes\n");

utils/loghole.1

@@ -238,8 +238,12 @@ example, the input parameters.  If the argument to this option is is a single
 dash (\fB-\fR) the comment will be read from standard in.
 .TP
 \fB-d\fR, \fB--delete
-Delete the files in the log directory after producing the archive.  The default
-action is to leave the files in place until the user is ready to delete them.
+After creating the archive, mark the experiment as
+.I clean-on-sync
+so that any stale data is cleaned out before performing the next
+.B sync
+operation.  Currently, the mark is a file named ".cleanonsync" in the
+experiment log directory.
 .SH CHANGE
 The
 .B change

utils/loghole.in

@@ -54,6 +54,8 @@ EXTENSIONS = [ ".zip" ]
 
 LINK_DUMP_FMT = [ "trace_%s-%s.xmit", "trace_%s-%s.recv" ]
 
+CLEANFILE = ".cleanonsync"
+
 DOT_LOGHOLES = """+ /var/
 + /var/emulab/
 + /var/emulab/logs/
@@ -258,8 +260,8 @@ def archive_usage():
     print "                         will be displayed in the listing generated"
     print "                         by the 'show' action.  Use a single dash "
     print "                         (-) to read the comment from standard in."
-    print "  -d, --delete           Delete the files in the log directory"
-    print "                         after producing the archive."
+    print "  -d, --delete           Mark the experiment as clean-on-sync to"
+    print "                         remove stale data before another sync."
     print
     print "Required arguments:"
     print "  archive-name  The name of the archive to create."
@@ -765,11 +767,7 @@ def do_archive(args):
     zf.close()
 
     if delete_dir:
-        for entry in os.listdir(logdir):
-            if os.path.isdir(entry):
-                os.rmdir(entry)
-                pass
-            pass
+        open(CLEANFILE, 'w')
         pass
 
     if VERBOSITY == VERBOSITY_MACHINE:
@@ -931,6 +929,11 @@ def do_sync(args, mode="sync", must_be_active=1):
     logdir = os.path.join(EXPDIR_FMT % { "PID" : PID, "EID" : EID }, "logs")
     os.chdir(logdir)
 
+    if os.path.exists(CLEANFILE):
+        do_clean(["-f", "-e"])
+        os.unlink(CLEANFILE)
+        pass
+
     fp = open(os.path.join(logdir, ".logholes"), "w")
     os.chmod(fp.name, 0664)
     fp.write(DOT_LOGHOLES)