Port of Foundation to Android #622
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,9 @@ | |
| #if DEPLOYMENT_TARGET_WINDOWS | ||
| #include <process.h> | ||
| #endif | ||
| #ifdef __ANDROID__ | ||
|
There was a problem hiding this comment. @parkera should we perhaps instead of using macros defined by the compiler use a DEPLOYMENT_TARGET_ANDROID for these? There was a problem hiding this comment. I can change it back if you like. |
||
| #include <android/log.h> | ||
| #endif | ||
| #include <math.h> | ||
| #include <string.h> | ||
| #include <stdio.h> | ||
|
|
@@ -764,7 +767,45 @@ void CFLog(CFLogLevel lev, CFStringRef format, ...) { | |
| #if DEPLOYMENT_RUNTIME_SWIFT | ||
| // Temporary as Swift cannot import varag C functions | ||
| void CFLog1(CFLogLevel lev, CFStringRef message) { | ||
| #ifdef __ANDROID__ | ||
| android_LogPriority priority = ANDROID_LOG_UNKNOWN; | ||
| switch (lev) { | ||
| case kCFLogLevelEmergency: priority = ANDROID_LOG_FATAL; break; | ||
| case kCFLogLevelAlert: priority = ANDROID_LOG_ERROR; break; | ||
| case kCFLogLevelCritical: priority = ANDROID_LOG_ERROR; break; | ||
| case kCFLogLevelError: priority = ANDROID_LOG_ERROR; break; | ||
| case kCFLogLevelWarning: priority = ANDROID_LOG_WARN; break; | ||
| case kCFLogLevelNotice: priority = ANDROID_LOG_WARN; break; | ||
| case kCFLogLevelInfo: priority = ANDROID_LOG_INFO; break; | ||
| case kCFLogLevelDebug: priority = ANDROID_LOG_DEBUG; break; | ||
| } | ||
|
|
||
| if (message == NULL) message = CFSTR("NULL"); | ||
|
|
||
| char stack_buffer[1024] = { 0 }; | ||
| char *buffer = &stack_buffer[0]; | ||
| CFStringEncoding encoding = kCFStringEncodingUTF8; | ||
| CFIndex maxLength = CFStringGetMaximumSizeForEncoding(CFStringGetLength(message), encoding) + 1; | ||
|
|
||
| if (maxLength > sizeof(stack_buffer) / sizeof(stack_buffer[0])) { | ||
| buffer = calloc(sizeof(char), maxLength); | ||
|
There was a problem hiding this comment. should check calloc() return value There was a problem hiding this comment. Too late now... There was a problem hiding this comment. Not too late - open up another PR. =) There was a problem hiding this comment. Alright already, new PR #655 |
||
| } | ||
|
|
||
| if (maxLength == 1) { | ||
| // was crashing with zero length strings | ||
| // https://bugs.swift.org/browse/SR-2666 | ||
| strcpy(buffer, " "); // log empty string | ||
| } | ||
| else | ||
| CFStringGetCString(message, buffer, maxLength, encoding); | ||
|
|
||
| const char *tag = "Swift"; // process name not available from NDK | ||
| __android_log_print(priority, tag, "%s", buffer); | ||
|
|
||
| if (buffer != &stack_buffer[0]) free(buffer); | ||
| #else | ||
| CFLog(lev, CFSTR("%@"), message); | ||
| #endif | ||
| } | ||
| #endif | ||
|
|
||
|
|
@@ -1265,7 +1306,7 @@ CFDictionaryRef __CFGetEnvironment() { | |
| extern char **environ; | ||
| char **envp = environ; | ||
| #elif DEPLOYMENT_TARGET_LINUX | ||
| #if !defined(environ) && !defined(__ANDROID__) | ||
|
There was a problem hiding this comment. Is this right? Do you really intend to leave environ undefined on Android? There was a problem hiding this comment. I believe So in theory this additional There was a problem hiding this comment. environ is already defined on Android. No need to redefine it to __environ. There was a problem hiding this comment. So this change can be reverted, yes? There was a problem hiding this comment. I’m saying it’s needed, honest! Full code is: #elif DEPLOYMENT_TARGET_LINUX There was a problem hiding this comment. I'm confused, if environ is already defined in Android, then the second half of your #if is never evaluated; if environ is undefined in Android, then what is envp on Android? Am I missing something? There was a problem hiding this comment. envrion is a C symbol on Android not a #define for the preprocessor so you can’t test for whether it exists with a #ifdef. It must be a #define on some other architectures. |
||
| #define environ __environ | ||
| #endif | ||
| char **envp = environ; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -196,6 +196,9 @@ internal func NSRequiresConcreteImplementation(_ fn: String = #function, file: S | |
| } | ||
|
|
||
| internal func NSUnimplemented(_ fn: String = #function, file: StaticString = #file, line: UInt = #line) -> Never { | ||
| #if os(Android) | ||
| NSLog("\(fn) is not yet implemented. \(file):\(line)") | ||
| #endif | ||
|
There was a problem hiding this comment. Why did we add an NSLog here? There was a problem hiding this comment. fatalError() doesn’t print anything on Android (asserts do). Just giving people a pointer. There was a problem hiding this comment. shouldn't fatalError call __android_log_print on android? There was a problem hiding this comment. It should but this is a Foundation PR. I’ll take a look. Annoyingly, using __android_log_print requires a -llog when you link so it wouldn’t be a trivial change. Looks like a change to https://github.com/apple/swift/blob/master/stdlib/public/runtime/Errors.cpp#L204 There was a problem hiding this comment. |
||
| fatalError("\(fn) is not yet implemented", file: file, line: line) | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
|
|
||
| #if !os(Android) // not available | ||
|
There was a problem hiding this comment. Still not happy about this. Is there a way, instead, to mark the class as unavailable on the Android platform? There was a problem hiding this comment. Can you tell me the syntax to specify a NSTask unavailable for android please. I’ll make the class unavailable and #if !os(Android) out it’s methods or would they not try to compile if marked unavailable. There was a problem hiding this comment. Had a quick look at removing the #if !os(Android), got the following: Foundation/NSTask.swift:95:2: warning: unknown platform 'Android' for attribute 'available' There was a problem hiding this comment. What does it take to add Android as a platform for the compiler to understand here? That may be a prereq to anyone doing anything meaningful on Android in the first place. There was a problem hiding this comment.
I think this means adding Android to the list of platforms that the Swift compiler knows about. Adding that (and maybe some other tweaks) should allow us to write There was a problem hiding this comment. It’s odd. The compiler knows about #if os(Android) giving an error if you mistype it but not @available(Android, unavailable). Can it be the list you mention as Linux is not on it? There was a problem hiding this comment. Yeah, that's a good point. I'm not 100% sure -- I just grepped around, found that spot, and thought it looked interesting. :) If adding Android to that list is indeed what @parkera had in mind, we could email the swift-dev mailing list to learn more about it. There was a problem hiding this comment. @parkera is having There was a problem hiding this comment. Jira https://bugs.swift.org/browse/SR-2670 has a response - currently not implemented. |
||
| import CoreFoundation | ||
|
|
||
| #if os(OSX) || os(iOS) | ||
|
|
@@ -455,3 +456,4 @@ private func posix(_ code: Int32) { | |
| default: fatalError("POSIX command failed with error: \(code)") | ||
| } | ||
| } | ||
| #endif | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the previous header does not exist what is to say the sys/syscall version exists? Perhaps that should be gated as well and #error'd on the else claiming that syscall.h is required
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
won’t it error anyway? It doesn’t fail silently or anything anti-social. This just improves the odds. I can gate it if you want.