[vlc-devel] [PATCH] macosx: log if the process is translated and if the user tries to update, install the native binary

[Felix Paul Kühne]

Hello Rémi,

> Am 08.12.2020 um 19:42 schrieb Rémi Denis-Courmont <remi at remlab.net>:
> 
> Le mardi 8 décembre 2020, 19:03:08 EET Felix Paul Kühne a écrit :
>> From: Felix Paul Kühne <felix at feepk.net>
>> 
>> ---
>> modules/gui/macosx/VLCMain.m | 33 +++++++++++++++++++++++++++++++--
>> 1 file changed, 31 insertions(+), 2 deletions(-)
>> 
>> diff --git a/modules/gui/macosx/VLCMain.m b/modules/gui/macosx/VLCMain.m
>> index ef1f6f7c0e..8b51f0b2e1 100644
>> --- a/modules/gui/macosx/VLCMain.m
>> +++ b/modules/gui/macosx/VLCMain.m
>> @@ -35,6 +35,7 @@
>> 
>> #include <stdlib.h>                                      /* malloc(),
>> free() */ #include <string.h>
>> +#include <sys/sysctl.h>
>> #include <vlc_common.h>
>> #include <vlc_atomic.h>
>> #include <vlc_actions.h>
>> @@ -68,6 +69,8 @@
>> 
>> #ifdef HAVE_SPARKLE
>> #import <Sparkle/Sparkle.h>                 /* we're the update delegate */
>> +NSString *const kIntel64UpdateURLString =
>> @"https://update.videolan.org/vlc/sparkle/vlc-intel64.xml"; +NSString
>> *const kARM64UpdateURLString =
>> @"https://update.videolan.org/vlc/sparkle/vlc-arm64.xml"; #endif
>> 
>> #pragma mark -
>> @@ -319,6 +322,26 @@ - (void)applicationDidFinishLaunching:(NSNotification
>> *)aNotification if (kidsAround && var_GetBool(p_playlist,
>> "playlist-autostart")) playlist_Control(p_playlist, PLAYLIST_PLAY, true);
>>     PL_UNLOCK;
>> +
>> +    /* on macOS 11 and later, check whether the user attempts to deploy
>> +     * the x86_64 binary on ARM-64 - if yes, log it */
>> +    if (OSX_BIGSUR_AND_HIGHER) {
>> +        if ([self processIsTranslated] > 0) {
>> +            msg_Warn(p_intf, "Process is translated!");
>> +        }
>> +    }
>> +}
>> +
>> +- (int)processIsTranslated
>> +{
>> +   int ret = 0;
>> +   size_t size = sizeof(ret);
>> +   if (sysctlbyname("sysctl.proc_translated", &ret, &size, NULL, 0) == -1)
>> { +      if (errno == ENOENT)
>> +         return 0;
>> +      return -1;
>> +   }
>> +   return ret;
> 
> Can't you just print the uname() machine name, or is it a lie?

It tells the truth about the physical architecture that the binary is executed on, but it is helpful for future user support and debug to log whether VLC was executed or not. This function reflects the sample code provided by Apple to detect the translation mode.

> 
>> 
>> #pragma mark -
>> @@ -390,9 +413,15 @@ - (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle
>> - (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater
>> {
>> #ifdef __x86_64__
>> -    return @"https://update.videolan.org/vlc/sparkle/vlc-intel64.xml";
>> +    if (OSX_BIGSUR_AND_HIGHER) {
>> +        if ([self processIsTranslated] > 0) {
>> +            msg_Dbg(p_intf, "Process is translated, on update, VLC will
>> install the native ARM-64 binary"); +            return
>> kARM64UpdateURLString;
>> +        }
>> +    }
>> +    return kIntel64UpdateURLString;
>> #elif __arm64__
>> -    return @"https://update.videolan.org/vlc/sparkle/vlc-arm64.xml";
>> +    return kARM64UpdateURLString;
>> #else
>>     #warning unsupported architecture
> 
> That should probably be an #error, or then you need to return some error 
> value.

Changed to #error locally for clarity.

Best regards,

Felix