X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_osx.cc;h=6df2f959e5fdb390f3bae4a1da1b1932eb226cd0;hb=1fc8c0c6d045404732497ba70bd2eccfbe4cc6f6;hp=fa12fb38003f5d1caf35fd3ec9ba7aab4954d572;hpb=a1f7bf2d9e5610075fbd898cdf52f4f8373741f2;p=dcpomatic.git diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index fa12fb380..6df2f959e 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,21 +18,23 @@ */ -#include "cross.h" + #include "compose.hpp" -#include "log.h" -#include "dcpomatic_log.h" #include "config.h" +#include "cross.h" +#include "dcpomatic_log.h" #include "exceptions.h" +#include "log.h" +#include "variant.h" +#include #include #include -extern "C" { -#include -} #include -#include -#include #include +#if BOOST_VERSION >= 106100 +#include +#endif +#include #include #include #include @@ -49,31 +51,21 @@ extern "C" { #include "i18n.h" + using std::pair; using std::list; using std::ifstream; using std::string; -using std::wstring; using std::make_pair; using std::vector; using std::cerr; using std::cout; using std::runtime_error; -using boost::shared_ptr; +using std::map; +using std::shared_ptr; using boost::optional; +using std::function; -/** @param s Number of seconds to sleep for */ -void -dcpomatic_sleep_seconds (int s) -{ - sleep (s); -} - -void -dcpomatic_sleep_milliseconds (int ms) -{ - usleep (ms * 1000); -} /** @return A string of CPU information (model name etc.) */ string @@ -83,78 +75,75 @@ cpu_info () char buffer[64]; size_t N = sizeof (buffer); - if (sysctlbyname ("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) { + if (sysctlbyname("machdep.cpu.brand_string", buffer, &N, 0, 0) == 0) { info = buffer; } return info; } -/** @return Path of the Contents directory in the .app */ + boost::filesystem::path -app_contents () +directory_containing_executable () { - return boost::dll::program_location().parent_path().parent_path(); + return dcp::filesystem::canonical(boost::dll::program_location()).parent_path(); } + boost::filesystem::path -shared_path () +resources_path () { - return app_contents() / "Resources"; + return directory_containing_executable().parent_path() / "Resources"; } + +boost::filesystem::path +libdcp_resources_path () +{ + return resources_path(); +} + + void -run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) +run_ffprobe(boost::filesystem::path content, boost::filesystem::path out, bool err, string args) { - boost::filesystem::path path = app_contents(); - path /= "MacOS"; - path /= "ffprobe"; + auto path = directory_containing_executable () / "ffprobe"; + if (!dcp::filesystem::exists(path)) { + /* This is a hack but we need ffprobe during tests */ + path = "/Users/ci/workspace/bin/ffprobe"; + } + string const redirect = err ? "2>" : ">"; - string ffprobe = "\"" + path.string() + "\" \"" + content.string() + "\" 2> \"" + out.string() + "\""; + auto const ffprobe = String::compose("\"%1\" %2 \"%3\" %4 \"%5\"", path, args.empty() ? " " : args, content.string(), redirect, out.string()); LOG_GENERAL (N_("Probing with %1"), ffprobe); - system (ffprobe.c_str ()); + system (ffprobe.c_str()); } -list > + + +list> mount_info () { - list > m; - return m; + return {}; } + boost::filesystem::path openssl_path () { - boost::filesystem::path path = app_contents(); - path /= "MacOS"; - path /= "openssl"; - return path; + return directory_containing_executable() / "openssl"; } + +#ifdef DCPOMATIC_DISK +/* Note: this isn't actually used at the moment as the disk writer is started as a service */ boost::filesystem::path disk_writer_path () { - boost::filesystem::path path = app_contents(); - path /= "MacOS"; - path /= "dcpomatic2_disk_writer"; - return path; + return directory_containing_executable() / "dcpomatic2_disk_writer"; } +#endif -/* Apparently there is no way to create an ofstream using a UTF-8 - filename under Windows. We are hence reduced to using fopen - with this wrapper. -*/ -FILE * -fopen_boost (boost::filesystem::path p, string t) -{ - return fopen (p.c_str(), t.c_str ()); -} - -int -dcpomatic_fseek (FILE* stream, int64_t offset, int whence) -{ - return fseek (stream, offset, whence); -} void Waker::nudge () @@ -162,218 +151,140 @@ Waker::nudge () } + Waker::Waker () { boost::mutex::scoped_lock lm (_mutex); - /* We should use this */ - // IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id); - /* but it's not available on 10.5, so we use this */ - IOPMAssertionCreate (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &_assertion_id); + IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id); } + Waker::~Waker () { boost::mutex::scoped_lock lm (_mutex); IOPMAssertionRelease (_assertion_id); } + void -start_tool (boost::filesystem::path dcpomatic, string executable, string app) +start_tool (string executable, string app) { - boost::filesystem::path batch = dcpomatic.parent_path (); - batch = batch.parent_path (); // MacOS - batch = batch.parent_path (); // Contents - batch = batch.parent_path (); // DCP-o-matic.app - batch = batch.parent_path (); // Applications - batch /= app; - batch /= "Contents"; - batch /= "MacOS"; - batch /= executable; + boost::algorithm::replace_all(app, " ", "\\ "); + + auto exe_path = directory_containing_executable(); + exe_path = exe_path.parent_path(); // Contents + exe_path = exe_path.parent_path(); // DCP-o-matic 2.app + exe_path = exe_path.parent_path(); // Applications + exe_path /= app; + exe_path /= "Contents"; + exe_path /= "MacOS"; + exe_path /= executable; pid_t pid = fork (); if (pid == 0) { - int const r = system (batch.string().c_str()); + LOG_GENERAL ("start_tool %1 %2 with path %3", executable, app, exe_path.string()); + int const r = system (exe_path.string().c_str()); exit (WEXITSTATUS (r)); + } else if (pid == -1) { + LOG_ERROR_NC("Fork failed in start_tool"); } } -void -start_batch_converter (boost::filesystem::path dcpomatic) -{ - start_tool (dcpomatic, "dcpomatic2_batch", "DCP-o-matic\\ 2\\ Batch\\ Converter.app"); -} void -start_player (boost::filesystem::path dcpomatic) -{ - start_tool (dcpomatic, "dcpomatic2_player", "DCP-o-matic\\ 2\\ Player.app"); -} - -uint64_t -thread_id () +start_batch_converter () { - return (uint64_t) pthread_self (); + start_tool("dcpomatic2_batch", variant::dcpomatic_batch_converter_app()); } -int -avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags) -{ - return avio_open (s, file.c_str(), flags); -} -boost::filesystem::path -home_directory () -{ - return getenv("HOME"); -} - -string -command_and_read (string cmd) +void +start_player () { - return ""; + start_tool("dcpomatic2_player", variant::dcpomatic_player_app()); } -/** @return true if this process is a 32-bit one running on a 64-bit-capable OS */ -bool -running_32_on_64 () -{ - /* I'm assuming nobody does this on OS X */ - return false; -} static optional get_vendor (CFDictionaryRef& description) { void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceVendorKey); if (!str) { - return optional(); + return {}; + } + + auto c_str = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8); + if (!c_str) { + return {}; } - string s = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8); + string s (c_str); boost::algorithm::trim (s); return s; } + static optional get_model (CFDictionaryRef& description) { void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceModelKey); if (!str) { - return optional(); + return {}; + } + + auto c_str = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8); + if (!c_str) { + return {}; } - string s = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8); + string s (c_str); boost::algorithm::trim (s); return s; } -struct MediaPath -{ - bool real; ///< true for a "real" disk, false for a synthesized APFS one - std::string prt; ///< "PRT" entry from the media path -}; -static optional -analyse_media_path (CFDictionaryRef& description) +static optional +mount_point (CFDictionaryRef& description) { - using namespace boost::algorithm; - - void const* str = CFDictionaryGetValue (description, kDADiskDescriptionMediaPathKey); - if (!str) { - return optional(); + auto volume_path_key = (CFURLRef) CFDictionaryGetValue (description, kDADiskDescriptionVolumePathKey); + if (!volume_path_key) { + return {}; } - string path(CFStringGetCStringPtr((CFStringRef) str, kCFStringEncodingUTF8)); - MediaPath mp; - if (starts_with(path, "IODeviceTree:")) { - mp.real = true; - } else if (starts_with(path, "IOService:")) { - mp.real = false; - } else { - return optional(); - } - - vector bits; - split(bits, path, boost::is_any_of("/")); - BOOST_FOREACH (string i, bits) { - if (starts_with(i, "PRT")) { - mp.prt = i; - } + char mount_path_buffer[1024]; + if (!CFURLGetFileSystemRepresentation(volume_path_key, false, (UInt8 *) mount_path_buffer, sizeof(mount_path_buffer))) { + return {}; } - - return mp; + return boost::filesystem::path(mount_path_buffer); } -static bool -is_whole_drive (DADiskRef& disk) -{ - io_service_t service = DADiskCopyIOMedia (disk); - CFTypeRef whole_media_ref = IORegistryEntryCreateCFProperty (service, CFSTR(kIOMediaWholeKey), kCFAllocatorDefault, 0); - bool whole_media = false; - if (whole_media_ref) { - whole_media = CFBooleanGetValue((CFBooleanRef) whole_media_ref); - CFRelease (whole_media_ref); - } - IOObjectRelease (service); - return whole_media; -} static bool -is_mounted (CFDictionaryRef& description) +get_bool(CFDictionaryRef& description, void const* key) { - CFURLRef volume_path_key = (CFURLRef) CFDictionaryGetValue (description, kDADiskDescriptionVolumePathKey); - char mount_path_buffer[1024]; - return CFURLGetFileSystemRepresentation(volume_path_key, false, (UInt8 *) mount_path_buffer, sizeof(mount_path_buffer)); + auto value = CFDictionaryGetValue(description, key); + if (!value) { + return false; + } + + return CFBooleanGetValue(reinterpret_cast(value)); } -/* Here follows some rather intricate and (probably) fragile code to find the list of available - * "real" drives on macOS that we might want to write a DCP to. - * - * We use the Disk Arbitration framework to give us a series of devices (/dev/disk0, /dev/disk1, - * /dev/disk1s1 and so on) and we use the API to gather useful information about these devices into - * a vector of Disk structs. - * - * Then we read the Disks that we found and try to derive a list of drives that we should offer to the - * user, with details of whether those drives are currently mounted or not. - * - * At the basic level we find the "disk"-level devices, looking at whether any of their partitions are mounted. - * - * This is complicated enormously by recent-ish macOS versions' habit of making `synthesized' volumes which - * reflect data in `real' partitions. So, for example, we might have a real (physical) drive /dev/disk2 with - * a partition /dev/disk2s2 whose content is made into a synthesized /dev/disk3, itself containing some partitions - * which are mounted. /dev/disk2s2 is not considered to be mounted, in this case. So we need to know that - * disk2s2 is related to disk3 so we can consider disk2s2 as mounted if any parts of disk3 are. In order to do - * this I am picking out what looks like a suitable identifier prefixed with PRT from the MediaContentKey. - * If disk2s2 and disk3 have the same PRT code I am assuming they are linked. - * - * Lots of this is guesswork and may be broken. In my defence the documentation that I have been able to - * unearth is, to put it impolitely, crap. - */ - -struct Disk -{ - string device; - optional vendor; - optional model; - bool real; - string prt; - bool whole; - bool mounted; - unsigned long size; -}; static void disk_appeared (DADiskRef disk, void* context) { - const char* bsd_name = DADiskGetBSDName (disk); + auto bsd_name = DADiskGetBSDName (disk); if (!bsd_name) { + LOG_DISK_NC("Disk with no BSDName appeared"); return; } LOG_DISK("%1 appeared", bsd_name); - Disk this_disk; + OSXDisk this_disk; this_disk.device = string("/dev/") + bsd_name; + LOG_DISK("Device is %1", this_disk.device); CFDictionaryRef description = DADiskCopyDescription (disk); @@ -381,86 +292,78 @@ disk_appeared (DADiskRef disk, void* context) this_disk.model = get_model (description); LOG_DISK("Vendor/model: %1 %2", this_disk.vendor.get_value_or("[none]"), this_disk.model.get_value_or("[none]")); - optional media_path = analyse_media_path (description); - if (!media_path) { - LOG_DISK("Finding media path for %1 failed", bsd_name); + auto mp = mount_point (description); + if (mp) { + this_disk.mount_points.push_back (*mp); + } + + auto media_size_cstr = CFDictionaryGetValue (description, kDADiskDescriptionMediaSizeKey); + if (!media_size_cstr) { + LOG_DISK_NC("Could not read media size"); return; } - this_disk.real = media_path->real; - this_disk.prt = media_path->prt; - this_disk.whole = is_whole_drive (disk); - this_disk.mounted = is_mounted (description); - LOG_DISK("%1 prt %2 whole %3 mounted %4", this_disk.real ? "Real" : "Synth", this_disk.prt, this_disk.whole ? "whole" : "part", this_disk.mounted ? "mounted" : "unmounted"); + this_disk.system = get_bool(description, kDADiskDescriptionDeviceInternalKey) && !get_bool(description, kDADiskDescriptionMediaRemovableKey); + this_disk.writeable = get_bool(description, kDADiskDescriptionMediaWritableKey); + this_disk.partition = string(bsd_name).find("s", 5) != std::string::npos; + + LOG_DISK( + "%1 %2 %3 %4 mounted at %5", + bsd_name, + this_disk.system ? "system" : "non-system", + this_disk.writeable ? "writeable" : "read-only", + this_disk.partition ? "partition" : "drive", + mp ? mp->string() : "[nowhere]" + ); - CFNumberGetValue ((CFNumberRef) CFDictionaryGetValue (description, kDADiskDescriptionMediaSizeKey), kCFNumberLongType, &this_disk.size); + CFNumberGetValue ((CFNumberRef) media_size_cstr, kCFNumberLongType, &this_disk.size); CFRelease (description); - reinterpret_cast*>(context)->push_back(this_disk); + reinterpret_cast*>(context)->push_back(this_disk); } + vector -get_drives () +Drive::get () { using namespace boost::algorithm; - vector disks; + vector disks; + + LOG_DISK_NC("Drive::get() starts"); - DASessionRef session = DASessionCreate(kCFAllocatorDefault); + auto session = DASessionCreate(kCFAllocatorDefault); if (!session) { - return vector(); + return {}; } + LOG_DISK_NC("Drive::get() has session"); + DARegisterDiskAppearedCallback (session, NULL, disk_appeared, &disks); - CFRunLoopRef run_loop = CFRunLoopGetCurrent (); + auto run_loop = CFRunLoopGetCurrent (); DASessionScheduleWithRunLoop (session, run_loop, kCFRunLoopDefaultMode); CFRunLoopStop (run_loop); CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.05, 0); DAUnregisterCallback(session, (void *) disk_appeared, &disks); CFRelease(session); - /* Mark disks containing mounted partitions as themselves mounted */ - BOOST_FOREACH (Disk& i, disks) { - if (!i.whole) { - continue; - } - BOOST_FOREACH (Disk& j, disks) { - if (j.mounted && starts_with(j.device, i.device)) { - LOG_DISK("Marking %1 as mounted because %2 is", i.device, j.device); - i.mounted = true; - } - } - } - - /* Make a list of the PRT codes of mounted, synthesized disks */ - vector mounted_synths; - BOOST_FOREACH (Disk& i, disks) { - if (!i.real && i.mounted) { - LOG_DISK("Found a mounted synth %1 with %2", i.device, i.prt); - mounted_synths.push_back (i.prt); + vector drives; + for (auto const& disk: disks) { + if (!disk.system && !disk.partition && disk.writeable) { + drives.push_back({disk.device, disk.mount_points, disk.size, disk.vendor, disk.model}); } } - /* Mark containers of those mounted synths as themselves mounted */ - BOOST_FOREACH (Disk& i, disks) { - if (i.real && find(mounted_synths.begin(), mounted_synths.end(), i.prt) != mounted_synths.end()) { - LOG_DISK("Marking %1 (%2) as mounted because it contains a mounted synth", i.device, i.prt); - i.mounted = true; - } + LOG_DISK("Drive::get() found %1 drives:", drives.size()); + for (auto const& drive: drives) { + LOG_DISK("%1 %2 mounted=%3", drive.description(), drive.device(), drive.mounted() ? "yes" : "no"); } - vector drives; - BOOST_FOREACH (Disk& i, disks) { - if (i.whole) { - /* A whole disk that is not a container for a mounted synth */ - LOG_DISK("Adding drive: %1 %2 %3 %4 %5", i.device, i.size, i.mounted ? "mounted" : "unmounted", i.vendor.get_value_or("[none]"), i.model.get_value_or("[none]")); - drives.push_back(Drive(i.device, i.size, i.mounted, i.vendor, i.model)); - } - } return drives; } + boost::filesystem::path -config_path () +config_path (optional version) { boost::filesystem::path p; p /= g_get_home_dir (); @@ -468,5 +371,90 @@ config_path () p /= "Preferences"; p /= "com.dcpomatic"; p /= "2"; + if (version) { + p /= *version; + } return p; } + + +struct UnmountState +{ + bool success = false; + bool callback = false; +}; + + +void done_callback(DADiskRef, DADissenterRef dissenter, void* context) +{ + LOG_DISK_NC("Unmount finished"); + auto state = reinterpret_cast(context); + state->callback = true; + if (dissenter) { + LOG_DISK("Error: %1", DADissenterGetStatus(dissenter)); + } else { + LOG_DISK_NC("Successful"); + state->success = true; + } +} + + +bool +Drive::unmount () +{ + LOG_DISK_NC("Unmount operation started"); + + auto session = DASessionCreate(kCFAllocatorDefault); + if (!session) { + return false; + } + + auto disk = DADiskCreateFromBSDName(kCFAllocatorDefault, session, _device.c_str()); + if (!disk) { + return false; + } + LOG_DISK("Requesting unmount of %1 from %2", _device, thread_id()); + UnmountState state; + DADiskUnmount(disk, kDADiskUnmountOptionWhole, &done_callback, &state); + CFRelease (disk); + + CFRunLoopRef run_loop = CFRunLoopGetCurrent (); + DASessionScheduleWithRunLoop (session, run_loop, kCFRunLoopDefaultMode); + CFRunLoopStop (run_loop); + CFRunLoopRunInMode(kCFRunLoopDefaultMode, 5, 0); + CFRelease(session); + + if (!state.callback) { + LOG_DISK_NC("End of unmount: timeout"); + } else { + LOG_DISK("End of unmount: %1", state.success ? "success" : "failure"); + } + return state.success; +} + + +void +disk_write_finished () +{ + +} + + +void +make_foreground_application () +{ + ProcessSerialNumber serial; +LIBDCP_DISABLE_WARNINGS + GetCurrentProcess (&serial); +LIBDCP_ENABLE_WARNINGS + TransformProcessType (&serial, kProcessTransformToForegroundApplication); +} + + +bool +show_in_file_manager (boost::filesystem::path, boost::filesystem::path select) +{ + int r = system (String::compose("open -R \"%1\"", select.string()).c_str()); + return static_cast(WEXITSTATUS(r)); +} +