rm is reflected from the backend to the frontend again.
authorSapan Bhatia <sapanb@cs.princeton.edu>
Thu, 28 Feb 2008 19:45:47 +0000 (19:45 +0000)
committerSapan Bhatia <sapanb@cs.princeton.edu>
Thu, 28 Feb 2008 19:45:47 +0000 (19:45 +0000)
backend.ml
frontend.ml

index 690f1c6..153e8ac 100644 (file)
@@ -139,7 +139,7 @@ class backendHandler dir_root (frontend_lst: frontendHandler list) =
                                     frontend#rmdir (mk_rel_path fqp)) slice_list
                      end
                    else List.iter (fun frontend ->
-                                     frontend#unlink (mk_rel_path fqp)) slice_list
+                                     fprintf logfd "Unlinking %s\n" fqp;flush Pervasives.stdout;frontend#unlink (mk_rel_path fqp)) slice_list
                  end
            end
          else (* regex not matched *)
index 3946736..ab4f176 100644 (file)
@@ -54,11 +54,13 @@ object(this)
   (** *)
   method unlink rp =
     match rp with Relpath(rel) ->
-    let fqp1 = String.concat "/" [root_dir;rel;".in"] in
-    let fqp2 = String.concat "/" [root_dir;rel;".out"] in
+    let fqp1 = String.concat "/" [root_dir;rel] in
+    let fqp_in = String.concat "." [fqp1;"in"] in
+    let fqp2 = String.concat "/" [root_dir;rel] in
+    let fqp_out = String.concat "." [fqp2;"out"] in
       try 
-        Unix.unlink fqp1;
-        Unix.unlink fqp2
+        Unix.unlink fqp_in;
+        Unix.unlink fqp_out
       with _ ->
         fprintf logfd "Hm. %s disappeared. Looks like slice %s shot itself in the foot\n" fqp1 (this#get_slice_name ());flush logfd