namespace filesystem {
-#define DEBUG_HEAVY_FILE_OPS
+//#define DEBUG_HEAVY_FILE_OPS
// 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())
+
+//////////////
+
+// the smallest we let the packing area's available space get before we stop filling it.
+const int MINIMUM_ARRAY_SIZE = 1024;
//////////////
double byte_start, const byte_array &chunk, bool truncate,
int copy_chunk_factor)
{
-#ifdef DEBUG_HEAVY_FILE_OPS
-// FUNCDEF("write_file_chunk");
-#endif
+ FUNCDEF("write_file_chunk");
if (byte_start < 0) return BAD_INPUT;
filename targ_name(target);
- if (!directory::recursive_create(targ_name.dirname().raw()))
+ astring targ_dir = targ_name.dirname().raw();
+#ifdef DEBUG_HEAVY_FILE_OPS
+ LOG(astring("creating target's directory: ") + targ_name.dirname().raw());
+#endif
+ if (!directory::recursive_create(targ_dir)) {
+ LOG(astring("failed to create directory: ") + targ_name.dirname().raw());
return TARGET_DIR_ERROR;
+ }
if (!targ_name.exists()) {
huge_file target_file(target, "w");
while (storage.length() < maximum_bytes) {
double remaining_in_array = maximum_bytes - storage.length()
- last_action.packed_size();
- if (remaining_in_array < 128) {
+ if (remaining_in_array < MINIMUM_ARRAY_SIZE) {
// ensure that we at least have a reasonable amount of space left
// for storing into the array.
break;
huge_file current(full_file, "rb");
if (!current.good()) {
// we need to skip this file.
-LOG(astring("skipping bad file: ") + full_file);
+ LOG(astring("skipping bad file: ") + full_file);
to_return = advance(to_transfer, last_action);
if (to_return != OKAY) break;
continue;
}
if (last_action._byte_start + last_action._length >= current.length()) {
-LOG(astring("finished stuffing file: ") + full_file);
// this file is done now. go to the next one.
+#ifdef DEBUG_HEAVY_FILE_OPS
+ LOG(astring("finished stuffing file: ") + full_file);
+#endif
to_return = advance(to_transfer, last_action);
if (to_return != OKAY) break;
continue;