webrtc/sdk/objc/api/logging/RTCCallbackLogger.mm
Artem Titov 63ee39d0be Revert "Add a prefix for objc category."
This reverts commit 181ea6e414.

Reason for revert: Breaks downstream project. Kári will help to land it next week.

Original change's description:
> Add a prefix for objc category.
>
> According to the Google Objective-C style [1], category names should
> start with an appropriate prefix. WebRTC has some category definitions
> for system interfaces, but it doesn't use prefixes.
>
> $ otool -ov WebRTC.framework/WebRTC | grep -E "^[0-9a-z]{16} 0x[0-9a-z]+ __OBJC_._CATEGORY" | grep -v "_RTC"
> 0000000002160840 0x217c3c0 __OBJC_$_CATEGORY_UIDevice_$_H264Profile
> 0000000002160850 0x21808b8 __OBJC_$_CATEGORY_AVCaptureSession_$_DevicePosition
> 0000000002160858 0x2180968 __OBJC_$_CATEGORY_NSString_$_StdString
> 0000000002160860 0x21809c8 __OBJC_$_CATEGORY_NSString_$_AbslStringView
>
> To avoid conflicts, prefix the names and methods of those categories.
> Also remove sdk/objc/Framework/Classes/Common/NSString+StdString.h as
> it is not used by any other files.
>
> [1] https://google.github.io/styleguide/objcguide.html#category-naming
>
> Bug: webrtc:13884
> Change-Id: I2cf2742af198ab4e0bfb15c0476d72971e50ceee
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262341
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36880}

Bug: webrtc:13884
Change-Id: I85257088e4a3a62e01ff925ab5e77af83b078ef3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262420
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36885}
2022-05-13 14:47:54 +00:00

151 lines
3.8 KiB
Text

/*
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#import "RTCCallbackLogger.h"
#import "helpers/NSString+StdString.h"
#include <memory>
#include "absl/strings/string_view.h"
#include "rtc_base/checks.h"
#include "rtc_base/log_sinks.h"
#include "rtc_base/logging.h"
namespace {
class CallbackLogSink final : public rtc::LogSink {
public:
CallbackLogSink(RTCCallbackLoggerMessageHandler callbackHandler)
: callback_handler_(callbackHandler) {}
void OnLogMessage(const std::string& message) override {
OnLogMessage(absl::string_view(message));
}
void OnLogMessage(absl::string_view message) override {
if (callback_handler_) {
callback_handler_([NSString stringForAbslStringView:message]);
}
}
private:
RTCCallbackLoggerMessageHandler callback_handler_;
};
class CallbackWithSeverityLogSink final : public rtc::LogSink {
public:
CallbackWithSeverityLogSink(RTCCallbackLoggerMessageAndSeverityHandler callbackHandler)
: callback_handler_(callbackHandler) {}
void OnLogMessage(const std::string& message) override { RTC_DCHECK_NOTREACHED(); }
void OnLogMessage(const std::string& message, rtc::LoggingSeverity severity) override {
OnLogMessage(absl::string_view(message), severity);
}
void OnLogMessage(absl::string_view message, rtc::LoggingSeverity severity) override {
if (callback_handler_) {
RTCLoggingSeverity loggingSeverity = NativeSeverityToObjcSeverity(severity);
callback_handler_([NSString stringForAbslStringView:message], loggingSeverity);
}
}
private:
static RTCLoggingSeverity NativeSeverityToObjcSeverity(rtc::LoggingSeverity severity) {
switch (severity) {
case rtc::LS_VERBOSE:
return RTCLoggingSeverityVerbose;
case rtc::LS_INFO:
return RTCLoggingSeverityInfo;
case rtc::LS_WARNING:
return RTCLoggingSeverityWarning;
case rtc::LS_ERROR:
return RTCLoggingSeverityError;
case rtc::LS_NONE:
return RTCLoggingSeverityNone;
}
}
RTCCallbackLoggerMessageAndSeverityHandler callback_handler_;
};
}
@implementation RTC_OBJC_TYPE (RTCCallbackLogger) {
BOOL _hasStarted;
std::unique_ptr<rtc::LogSink> _logSink;
}
@synthesize severity = _severity;
- (instancetype)init {
self = [super init];
if (self != nil) {
_severity = RTCLoggingSeverityInfo;
}
return self;
}
- (void)dealloc {
[self stop];
}
- (void)start:(nullable RTCCallbackLoggerMessageHandler)handler {
if (_hasStarted) {
return;
}
_logSink.reset(new CallbackLogSink(handler));
rtc::LogMessage::AddLogToStream(_logSink.get(), [self rtcSeverity]);
_hasStarted = YES;
}
- (void)startWithMessageAndSeverityHandler:
(nullable RTCCallbackLoggerMessageAndSeverityHandler)handler {
if (_hasStarted) {
return;
}
_logSink.reset(new CallbackWithSeverityLogSink(handler));
rtc::LogMessage::AddLogToStream(_logSink.get(), [self rtcSeverity]);
_hasStarted = YES;
}
- (void)stop {
if (!_hasStarted) {
return;
}
RTC_DCHECK(_logSink);
rtc::LogMessage::RemoveLogToStream(_logSink.get());
_hasStarted = NO;
_logSink.reset();
}
#pragma mark - Private
- (rtc::LoggingSeverity)rtcSeverity {
switch (_severity) {
case RTCLoggingSeverityVerbose:
return rtc::LS_VERBOSE;
case RTCLoggingSeverityInfo:
return rtc::LS_INFO;
case RTCLoggingSeverityWarning:
return rtc::LS_WARNING;
case RTCLoggingSeverityError:
return rtc::LS_ERROR;
case RTCLoggingSeverityNone:
return rtc::LS_NONE;
}
}
@end