projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1d0e3f7
)
still not right. works for basic stuff, fails for large hierarchies.
author
Chris Koeritz
<fred@gruntose.com>
Tue, 2 Oct 2012 19:15:59 +0000
(15:15 -0400)
committer
Chris Koeritz
<fred@gruntose.com>
Tue, 2 Oct 2012 19:15:59 +0000
(15:15 -0400)
nucleus/library/filesystem/directory_tree.cpp
patch
|
blob
|
history
nucleus/library/filesystem/heavy_file_ops.cpp
patch
|
blob
|
history
octopi/library/tentacles/recursive_file_copy.cpp
patch
|
blob
|
history
diff --git
a/nucleus/library/filesystem/directory_tree.cpp
b/nucleus/library/filesystem/directory_tree.cpp
index bf554db17b3f289210780fd387c9a342ab5e9193..c9354f8bce7e2af5b30566307ad2f5e1779037ea 100644
(file)
--- a/
nucleus/library/filesystem/directory_tree.cpp
+++ b/
nucleus/library/filesystem/directory_tree.cpp
@@
-34,7
+34,7
@@
using namespace nodes;
using namespace structures;
using namespace textual;
using namespace structures;
using namespace textual;
-#define DEBUG_DIRECTORY_TREE
+
//
#define DEBUG_DIRECTORY_TREE
// uncomment for noisier version.
#undef LOG
// uncomment for noisier version.
#undef LOG
diff --git
a/nucleus/library/filesystem/heavy_file_ops.cpp
b/nucleus/library/filesystem/heavy_file_ops.cpp
index 05da6a992b58f267540ebceb8577098aba0e99ef..9a5451b74687355869bcf82de5e0803efc703423 100644
(file)
--- a/
nucleus/library/filesystem/heavy_file_ops.cpp
+++ b/
nucleus/library/filesystem/heavy_file_ops.cpp
@@
-27,16
+27,12
@@
using namespace structures;
namespace filesystem {
namespace filesystem {
-#define DEBUG_HEAVY_FILE_OPS
+
//
#define DEBUG_HEAVY_FILE_OPS
// uncomment for noisier debugging.
#undef LOG
// uncomment for noisier debugging.
#undef LOG
-#ifdef DEBUG_HEAVY_FILE_OPS
- #include <stdio.h>
- #define LOG(to_print) printf("%s::%s: %s\n", static_class_name(), func, astring(to_print).s())
-#else
- #define LOG(s) {if(!!s){}}
-#endif
+#include <stdio.h>
+#define LOG(to_print) printf("%s::%s: %s\n", static_class_name(), func, astring(to_print).s())
//////////////
//////////////
@@
-290,7
+286,9
@@
outcome heavy_file_operations::buffer_files(const astring &source_root,
if (last_action._byte_start + last_action._length >= current.length()) {
// this file is done now. go to the next one.
if (last_action._byte_start + last_action._length >= current.length()) {
// this file is done now. go to the next one.
+#ifdef DEBUG_HEAVY_FILE_OPS
LOG(astring("finished stuffing file: ") + full_file);
LOG(astring("finished stuffing file: ") + full_file);
+#endif
to_return = advance(to_transfer, last_action);
if (to_return != OKAY) break;
continue;
to_return = advance(to_transfer, last_action);
if (to_return != OKAY) break;
continue;
diff --git
a/octopi/library/tentacles/recursive_file_copy.cpp
b/octopi/library/tentacles/recursive_file_copy.cpp
index 0b33269f73f858fadb768b12fe6a87ea366fc43f..baf40fe75afcd3731996a5d4d4421a839230d848 100644
(file)
--- a/
octopi/library/tentacles/recursive_file_copy.cpp
+++ b/
octopi/library/tentacles/recursive_file_copy.cpp
@@
-29,6
+29,7
@@
#include <octopus/octopus.h>
#include <structures/static_memory_gremlin.h>
#include <textual/string_manipulation.h>
#include <octopus/octopus.h>
#include <structures/static_memory_gremlin.h>
#include <textual/string_manipulation.h>
+#include <timely/time_control.h>
using namespace application;
using namespace basis;
using namespace application;
using namespace basis;
@@
-36,6
+37,7
@@
using namespace filesystem;
using namespace loggers;
using namespace structures;
using namespace textual;
using namespace loggers;
using namespace structures;
using namespace textual;
+using namespace timely;
namespace octopi {
namespace octopi {