| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| 11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
| 12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
| 13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
| 14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
| 15 * | 15 * |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
| 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #import <Foundation/Foundation.h> | 28 #import <Foundation/Foundation.h> |
| 29 | 29 |
| 30 // We route all logging through the WebRTC logger. By doing this we will get | 30 // Subset of rtc::LoggingSeverity. |
| 31 // both app and WebRTC logs in the same place, which we can then route to a | 31 typedef NS_ENUM(NSInteger, RTCLoggingSeverity) { |
| 32 // file if we need to. A side effect of this is that we get severity for free. | 32 kRTCLoggingSeverityVerbose, |
| 33 typedef NS_ENUM(NSInteger, ARDLogSeverity) { | 33 kRTCLoggingSeverityInfo, |
| 34 kARDLogSeverityVerbose, | 34 kRTCLoggingSeverityWarning, |
| 35 kARDLogSeverityInfo, | 35 kRTCLoggingSeverityError, |
| 36 kARDLogSeverityWarning, | |
| 37 kARDLogSeverityError, | |
| 38 }; | 36 }; |
| 39 | 37 |
| 40 #if defined(__cplusplus) | 38 #if defined(__cplusplus) |
| 41 extern "C" void ARDLogToWebRTCLogger(ARDLogSeverity severity, | 39 extern "C" void RTCLogEx(RTCLoggingSeverity severity, NSString* logString); |
| 42 NSString *logString); | 40 extern "C" void RTCSetMinDebugLogLevel(RTCLoggingSeverity severity); |
| 43 extern "C" NSString *ARDFileName(const char *filePath); | 41 extern "C" NSString* RTCFileName(const char* filePath); |
| 44 extern "C" void ARDLogInit(); | |
| 45 #else | 42 #else |
| 46 // Logs |logString| to the WebRTC logger at the given severity. | 43 |
| 47 extern void ARDLogToWebRTCLogger(ARDLogSeverity severity, NSString *logString); | 44 // Wrapper for C++ LOG(sev) macros. |
| 45 // Logs the log string to the webrtc logstream for the given severity. |
| 46 extern void RTCLogEx(RTCLoggingSeverity severity, NSString* logString); |
| 47 |
| 48 // Wrapper for rtc::LogMessage::LogToDebug. |
| 49 // Sets the minimum severity to be logged to console. |
| 50 extern void RTCSetMinDebugLogLevel(RTCLoggingSeverity severity); |
| 51 |
| 48 // Returns the filename with the path prefix removed. | 52 // Returns the filename with the path prefix removed. |
| 49 extern NSString *ARDFileName(const char *filePath); | 53 extern NSString* RTCFileName(const char* filePath); |
| 50 // Initializes the correct logging levels. This should be called once on app | 54 |
| 51 // startup. | |
| 52 extern void ARDLogInit(); | |
| 53 #endif | 55 #endif |
| 54 | 56 |
| 55 #define ARDLogString(format, ...) \ | 57 // Some convenience macros. |
| 58 |
| 59 #define RTCLogString(format, ...) \ |
| 56 [NSString stringWithFormat:@"(%@:%d %s): " format, \ | 60 [NSString stringWithFormat:@"(%@:%d %s): " format, \ |
| 57 ARDFileName(__FILE__), \ | 61 RTCFileName(__FILE__), \ |
| 58 __LINE__, \ | 62 __LINE__, \ |
| 59 __FUNCTION__, \ | 63 __FUNCTION__, \ |
| 60 ##__VA_ARGS__] | 64 ##__VA_ARGS__] |
| 61 | 65 |
| 62 #define ARDLogEx(severity, format, ...) \ | 66 #define RTCLogFormat(severity, format, ...) \ |
| 63 do { \ | 67 do { \ |
| 64 NSString *logString = ARDLogString(format, ##__VA_ARGS__); \ | 68 NSString *logString = RTCLogString(format, ##__VA_ARGS__); \ |
| 65 ARDLogToWebRTCLogger(severity, logString); \ | 69 RTCLogEx(severity, logString); \ |
| 66 } while (false) | 70 } while (false) |
| 67 | 71 |
| 68 #define ARDLogVerbose(format, ...) \ | 72 #define RTCLogVerbose(format, ...) \ |
| 69 ARDLogEx(kARDLogSeverityVerbose, format, ##__VA_ARGS__) \ | 73 RTCLogFormat(kRTCLoggingSeverityVerbose, format, ##__VA_ARGS__) \ |
| 70 | 74 |
| 71 #define ARDLogInfo(format, ...) \ | 75 #define RTCLogInfo(format, ...) \ |
| 72 ARDLogEx(kARDLogSeverityInfo, format, ##__VA_ARGS__) \ | 76 RTCLogFormat(kRTCLoggingSeverityInfo, format, ##__VA_ARGS__) \ |
| 73 | 77 |
| 74 #define ARDLogWarning(format, ...) \ | 78 #define RTCLogWarning(format, ...) \ |
| 75 ARDLogEx(kARDLogSeverityWarning, format, ##__VA_ARGS__) \ | 79 RTCLogFormat(kRTCLoggingSeverityWarning, format, ##__VA_ARGS__) \ |
| 76 | 80 |
| 77 #define ARDLogError(format, ...) \ | 81 #define RTCLogError(format, ...) \ |
| 78 ARDLogEx(kARDLogSeverityError, format, ##__VA_ARGS__) \ | 82 RTCLogFormat(kRTCLoggingSeverityError, format, ##__VA_ARGS__) \ |
| 79 | 83 |
| 80 #ifdef _DEBUG | 84 #ifdef _DEBUG |
| 81 #define ARDLogDebug(format, ...) ARDLogInfo(format, ##__VA_ARGS__) | 85 #define RTCLogDebug(format, ...) RTCLogInfo(format, ##__VA_ARGS__) |
| 82 #else | 86 #else |
| 83 #define ARDLogDebug(format, ...) \ | 87 #define RTCLogDebug(format, ...) \ |
| 84 do { \ | 88 do { \ |
| 85 } while (false) | 89 } while (false) |
| 86 #endif | 90 #endif |
| 87 | 91 |
| 88 #define ARDLog(format, ...) ARDLogInfo(format, ##__VA_ARGS__) | 92 #define RTCLog(format, ...) RTCLogInfo(format, ##__VA_ARGS__) |
| OLD | NEW |