CMakeLists.txt

@@ -39,10 +39,6 @@ target_link_libraries(solanaceae_ngcft1 PUBLIC
 ########################################
 
 add_library(solanaceae_sha1_ngcft1
-	# hacky deps
-	./solanaceae/ngc_ft1_sha1/mio.hpp
-	./solanaceae/ngc_ft1_sha1/file_rw_mapped.hpp
-
 	./solanaceae/ngc_ft1_sha1/hash_utils.hpp
 	./solanaceae/ngc_ft1_sha1/hash_utils.cpp
 

solanaceae/ngc_ft1_sha1/file_rw_mapped.hpp

@@ -1,59 +0,0 @@
-#pragma once
-
-#include <solanaceae/message3/file.hpp>
-
-#include "./mio.hpp"
-
-#include <filesystem>
-#include <fstream>
-#include <cstring>
-
-struct FileRWMapped : public FileI {
-	mio::ummap_sink _file_map;
-
-	// TODO: add truncate support?
-	FileRWMapped(std::string_view file_path, uint64_t file_size) {
-		_file_size = file_size;
-
-		if (!std::filesystem::exists(file_path)) {
-			std::ofstream(std::string{file_path}) << '\0'; // force create the file
-		}
-		std::filesystem::resize_file(file_path, file_size); // ensure size, usually sparse
-
-		std::error_code err;
-		// sink, is also read
-		//_file_map = mio::make_mmap_sink(file_path, 0, file_size, err);
-		//_file_map = mio::make_mmap<mio::ummap_sink>(file_path, 0, file_size, err);
-		_file_map.map(file_path, 0, file_size, err);
-
-		if (err) {
-			// TODO: errro
-			return;
-		}
-	}
-
-	virtual ~FileRWMapped(void) {}
-
-	bool isGood(void) override {
-		return _file_map.is_mapped();
-	}
-
-	std::vector<uint8_t> read(uint64_t pos, uint32_t size) override {
-		if (pos+size > _file_size) {
-			return {};
-		}
-
-		return {_file_map.data()+pos, _file_map.data()+pos+size};
-	}
-
-	bool write(uint64_t pos, const std::vector<uint8_t>& data) override {
-		if (pos+data.size() > _file_size) {
-			return false;
-		}
-
-		std::memcpy(_file_map.data()+pos, data.data(), data.size());
-
-		return true;
-	}
-};
-

solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp

@@ -1,5 +1,6 @@
 #include "./sha1_ngcft1.hpp"
 
+#include <mutex>
 #include <solanaceae/toxcore/utils.hpp>
 
 #include <solanaceae/contact/components.hpp>
@@ -8,7 +9,7 @@
 #include <solanaceae/tox_messages/components.hpp>
 
 #include <solanaceae/message3/file_r_file.hpp>
-#include "./file_rw_mapped.hpp"
+#include <solanaceae/message3/file_rw_file.hpp>
 
 #include "./ft1_sha1_info.hpp"
 #include "./hash_utils.hpp"
@@ -20,7 +21,6 @@
 #include <iostream>
 #include <variant>
 #include <filesystem>
-#include <mutex>
 #include <future>
 
 namespace Message::Components {
@@ -533,10 +533,13 @@ bool SHA1_NGCFT1::onEvent(const Message::Events::MessageUpdated& e) {
 
 	ce.emplace<Message::Components::Transfer::FileInfoLocal>(std::vector{full_file_path});
 
-	std::unique_ptr<FileRWMapped> file_impl;
+	std::unique_ptr<FileRWFile> file_impl;
 	const bool file_exists = std::filesystem::exists(full_file_path);
 
-	file_impl = std::make_unique<FileRWMapped>(full_file_path, info.file_size);
+	{
+		const bool truncate = !file_exists;
+		file_impl = std::make_unique<FileRWFile>(full_file_path, info.file_size, truncate);
+	}
 
 	if (!file_impl->isGood()) {
 		std::cerr << "SHA1_NGCFT1 error: failed opening file '" << full_file_path << "'!\n";
@@ -788,9 +791,7 @@ bool SHA1_NGCFT1::onEvent(const Events::NGCFT1_recv_data& e) {
 
 			// TODO: avoid temporary copy
 			// TODO: check return
-			if (!file->write(offset_into_file + e.data_offset, {e.data, e.data + e.data_size})) {
+			file->write(offset_into_file + e.data_offset, {e.data, e.data + e.data_size});
-				std::cerr << "SHA1_NGCFT1 error: writing file failed o:" << offset_into_file + e.data_offset << "\n";
-			}
 		}
 	} else {
 		assert(false && "unhandled case");
@@ -922,6 +923,12 @@ bool SHA1_NGCFT1::onEvent(const Events::NGCFT1_recv_done& e) {
 		if (info.chunks.at(chunk_index) == got_hash) {
 			std::cout << "SHA1_NGCFT1: got chunk [" << SHA1Digest{got_hash} << "]\n";
 
+			// remove from requested
+			// TODO: remove at init and track running transfers differently
+			for (const auto it : std::get<ReceivingTransfer::Chunk>(tv).chunk_indices) {
+				ce.get_or_emplace<Components::FT1ChunkSHA1Requested>().chunks.erase(it);
+			}
+
 			if (!cc.have_all) {
 				for (const auto inner_chunk_index : std::get<ReceivingTransfer::Chunk>(tv).chunk_indices) {
 					if (!cc.have_all && !cc.have_chunk.at(inner_chunk_index)) {
@@ -948,13 +955,7 @@ bool SHA1_NGCFT1::onEvent(const Events::NGCFT1_recv_done& e) {
 			}
 		} else {
 			// bad chunk
-			std::cout << "SHA1_NGCFT1: got BAD chunk from " << e.group_number << ":" << e.peer_number << " [" << info.chunks.at(chunk_index) << "] ; instead got [" << SHA1Digest{got_hash} << "]\n";
+			// TODO: requeue?
-		}
-
-		// remove from requested
-		// TODO: remove at init and track running transfers differently
-		for (const auto it : std::get<ReceivingTransfer::Chunk>(tv).chunk_indices) {
-			ce.get_or_emplace<Components::FT1ChunkSHA1Requested>().chunks.erase(it);
 		}
 
 		updateMessages(ce); // mostly for received bytes