X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_disk_writer.cc;h=3fabe3e28f8a90bb0b216351d490e8ace4650416;hb=56caa542a558a3e261a3da4773c9ed3e66e262ab;hp=0bd5dcbc451c80c5875450f3e44105bf4cbae03c;hpb=a1f7bf2d9e5610075fbd898cdf52f4f8373741f2;p=dcpomatic.git diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc index 0bd5dcbc4..3fabe3e28 100644 --- a/src/tools/dcpomatic_disk_writer.cc +++ b/src/tools/dcpomatic_disk_writer.cc @@ -42,6 +42,7 @@ extern "C" { #endif #ifdef DCPOMATIC_OSX +#include "lib/stdout_log.h" #undef nil extern "C" { #include @@ -80,11 +81,12 @@ using boost::optional; #ifdef DCPOMATIC_LINUX static PolkitAuthority* polkit_authority = 0; #endif -static boost::filesystem::path dcp_path; -static std::string device; static uint64_t const block_size = 4096; static Nanomsg* nanomsg = 0; +#define SHORT_TIMEOUT 100 +#define LONG_TIMEOUT 2000 + static void count (boost::filesystem::path dir, uint64_t& total_bytes) @@ -118,6 +120,8 @@ write (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total uint8_t* buffer = new uint8_t[block_size]; Digester digester; + int progress_frequency = 5000; + int progress_count = 0; uint64_t remaining = file_size (from); while (remaining > 0) { uint64_t const this_time = min(remaining, block_size); @@ -147,7 +151,11 @@ write (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total } remaining -= this_time; total_remaining -= this_time; - nanomsg->blocking_send(String::compose(DISK_WRITER_PROGRESS "\n%1\n", (1 - float(total_remaining) / total))); + + ++progress_count; + if ((progress_count % progress_frequency) == 0) { + nanomsg->send(String::compose(DISK_WRITER_PROGRESS "\n%1\n", (1 - float(total_remaining) / total)), SHORT_TIMEOUT); + } } fclose (in); @@ -186,7 +194,7 @@ read (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total_ digester.add (buffer, this_time); remaining -= this_time; total_remaining -= this_time; - nanomsg->blocking_send(String::compose(DISK_WRITER_PROGRESS "\n%1\n", (1 - float(total_remaining) / total))); + nanomsg->send(String::compose(DISK_WRITER_PROGRESS "\n%1\n", (1 - float(total_remaining) / total)), SHORT_TIMEOUT); } ext4_fclose (&in); @@ -229,9 +237,10 @@ copy (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total_ } } + static void -write () +write (boost::filesystem::path dcp_path, string device) try { // ext4_dmask_set (DEBUG_ALL); @@ -274,16 +283,18 @@ try } LOG_DISK_NC ("Wrote MBR"); -#ifdef DCPOMATIC_WINDOWS struct ext4_mbr_bdevs bdevs; r = ext4_mbr_scan (bd, &bdevs); if (r != EOK) { throw CopyError ("Failed to read MBR", r); } +#ifdef DCPOMATIC_WINDOWS file_windows_partition_set (bdevs.partitions[0].part_offset, bdevs.partitions[0].part_size); #endif + LOG_DISK ("Writing to partition at %1 size %2; bd part size is %3", bdevs.partitions[0].part_offset, bdevs.partitions[0].part_size, bd->part_size); + #ifdef DCPOMATIC_LINUX /* Re-read the partition table */ int fd = open(device.c_str(), O_RDONLY); @@ -314,9 +325,9 @@ try } LOG_DISK_NC ("Opened partition"); - nanomsg->blocking_send(DISK_WRITER_FORMATTING "\n"); + nanomsg->send(DISK_WRITER_FORMATTING "\n", SHORT_TIMEOUT); - r = ext4_mkfs(&fs, bd, &info, F_SET_EXT4); + r = ext4_mkfs(&fs, bd, &info, F_SET_EXT2); if (r != EOK) { throw CopyError ("Failed to make filesystem", r); } @@ -349,117 +360,165 @@ try } ext4_device_unregister("ext4_fs"); - nanomsg->blocking_send(DISK_WRITER_OK "\n"); + if (!nanomsg->send(DISK_WRITER_OK "\n", LONG_TIMEOUT)) { + throw CommunicationFailedError (); + } + + disk_write_finished (); } catch (CopyError& e) { - LOG_DISK("CopyError: %1 %2", e.message(), e.number()); - nanomsg->blocking_send(String::compose(DISK_WRITER_ERROR "\n%1\n%2\n", e.message(), e.number())); + LOG_DISK("CopyError (from write): %1 %2", e.message(), e.number().get_value_or(0)); + nanomsg->send(String::compose(DISK_WRITER_ERROR "\n%1\n%2\n", e.message(), e.number().get_value_or(0)), LONG_TIMEOUT); } catch (VerifyError& e) { - LOG_DISK("VerifyError: %1 %2", e.message(), e.number()); - nanomsg->blocking_send(String::compose(DISK_WRITER_ERROR "\n%1\n%2\n", e.message(), e.number())); + LOG_DISK("VerifyError (from write): %1 %2", e.message(), e.number()); + nanomsg->send(String::compose(DISK_WRITER_ERROR "\n%1\n%2\n", e.message(), e.number()), LONG_TIMEOUT); } catch (exception& e) { - LOG_DISK("Exception: %1", e.what()); - nanomsg->blocking_send(String::compose(DISK_WRITER_ERROR "\n%1\n0\n", e.what())); + LOG_DISK("Exception (from write): %1", e.what()); + nanomsg->send(String::compose(DISK_WRITER_ERROR "\n%1\n0\n", e.what()), LONG_TIMEOUT); } +struct Parameters +{ + boost::filesystem::path dcp_path; + std::string device; +}; + #ifdef DCPOMATIC_LINUX static void -polkit_callback (GObject *, GAsyncResult* res, gpointer) +polkit_callback (GObject *, GAsyncResult* res, gpointer data) { + Parameters* parameters = reinterpret_cast (data); PolkitAuthorizationResult* result = polkit_authority_check_authorization_finish (polkit_authority, res, 0); if (result && polkit_authorization_result_get_is_authorized(result)) { - write (); + write (parameters->dcp_path, parameters->device); } + delete parameters; if (result) { g_object_unref (result); } } #endif + bool idle () +try { using namespace boost::algorithm; - optional s = nanomsg->nonblocking_get (); + optional s = nanomsg->receive (0); if (!s) { return true; } - if (*s == "Q") { + LOG_DISK("Writer receives command: %1", *s); + + if (*s == DISK_WRITER_QUIT) { exit (EXIT_SUCCESS); - } else if (*s == "W") { - dcp_path = nanomsg->blocking_get(); - device = nanomsg->blocking_get(); + } else if (*s == DISK_WRITER_UNMOUNT) { + /* XXX: should do Linux polkit stuff here */ + optional xml_head = nanomsg->receive (LONG_TIMEOUT); + optional xml_body = nanomsg->receive (LONG_TIMEOUT); + if (!xml_head || !xml_body) { + LOG_DISK_NC("Failed to receive unmount request"); + throw CommunicationFailedError (); + } + bool const success = Drive(*xml_head + *xml_body).unmount(); + if (!nanomsg->send (success ? (DISK_WRITER_OK "\n") : (DISK_WRITER_ERROR "\n"), LONG_TIMEOUT)) { + LOG_DISK_NC("CommunicationFailedError in unmount_finished"); + throw CommunicationFailedError (); + } + } else if (*s == DISK_WRITER_WRITE) { + optional dcp_path = nanomsg->receive (LONG_TIMEOUT); + optional device = nanomsg->receive (LONG_TIMEOUT); + if (!dcp_path || !device) { + LOG_DISK_NC("Failed to receive write request"); + throw CommunicationFailedError(); + } /* Do some basic sanity checks; this is a bit belt-and-braces but it can't hurt... */ #ifdef DCPOMATIC_OSX - if (!starts_with(device, "/dev/disk")) { - LOG_DISK ("Will not write to %1", device); - nanomsg->blocking_send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n"); + if (!starts_with(*device, "/dev/rdisk")) { + LOG_DISK ("Will not write to %1", *device); + nanomsg->send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n", LONG_TIMEOUT); return true; } #endif #ifdef DCPOMATIC_LINUX - if (!starts_with(device, "/dev/sd") && !starts_with(device, "/dev/hd")) { - LOG_DISK ("Will not write to %1", device); - nanomsg->blocking_send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n"); + if (!starts_with(*device, "/dev/sd") && !starts_with(*device, "/dev/hd")) { + LOG_DISK ("Will not write to %1", *device); + nanomsg->send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n", LONG_TIMEOUT); return true; } #endif #ifdef DCPOMATIC_WINDOWS - if (!starts_with(device, "\\\\.\\PHYSICALDRIVE")) { - LOG_DISK ("Will not write to %1", device); - nanomsg->blocking_send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n"); + if (!starts_with(*device, "\\\\.\\PHYSICALDRIVE")) { + LOG_DISK ("Will not write to %1", *device); + nanomsg->send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n", LONG_TIMEOUT); return true; } #endif bool on_drive_list = false; bool mounted = false; - for (auto const& i: get_drives()) { - if (i.internal_name() == device) { + for (auto const& i: Drive::get()) { + if (i.device() == *device) { on_drive_list = true; mounted = i.mounted(); } } if (!on_drive_list) { - LOG_DISK ("Will not write to %1 as it's not recognised as a drive", device); - nanomsg->blocking_send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n"); + LOG_DISK ("Will not write to %1 as it's not recognised as a drive", *device); + nanomsg->send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n", LONG_TIMEOUT); return true; } if (mounted) { - LOG_DISK ("Will not write to %1 as it's mounted", device); - nanomsg->blocking_send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n"); + LOG_DISK ("Will not write to %1 as it's mounted", *device); + nanomsg->send(DISK_WRITER_ERROR "\nRefusing to write to this drive\n1\n", LONG_TIMEOUT); return true; } - LOG_DISK ("Here we go writing %1 to %2", dcp_path, device); + LOG_DISK ("Here we go writing %1 to %2", *dcp_path, *device); #ifdef DCPOMATIC_LINUX polkit_authority = polkit_authority_get_sync (0, 0); PolkitSubject* subject = polkit_unix_process_new (getppid()); + Parameters* parameters = new Parameters; + parameters->dcp_path = *dcp_path; + parameters->device = *device; polkit_authority_check_authorization ( - polkit_authority, subject, "com.dcpomatic.write-drive", 0, POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION, 0, polkit_callback, 0 + polkit_authority, subject, "com.dcpomatic.write-drive", 0, POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION, 0, polkit_callback, parameters ); #else - write (); + write (*dcp_path, *device); #endif } + return true; +} catch (exception& e) { + LOG_DISK("Exception (from idle): %1", e.what()); return true; } int main () { +#ifdef DCPOMATIC_OSX + /* On macOS this is running as root, so config_path() will be somewhere in root's + * home. Instead, just write to stdout as the macOS process control stuff will + * redirect this to a file in /var/log + */ + dcpomatic_log.reset(new StdoutLog(LogEntry::TYPE_DISK)); + LOG_DISK_NC("dcpomatic_disk_writer started"); +#else /* XXX: this is a hack, but I expect we'll need logs and I'm not sure if there's * a better place to put them. */ dcpomatic_log.reset(new FileLog(config_path() / "disk_writer.log", LogEntry::TYPE_DISK)); LOG_DISK_NC("dcpomatic_disk_writer started"); +#endif try { nanomsg = new Nanomsg (false);