[Gpr_To_Absl_Logging]

pull/37386/head
tanvi-jagtap 4 months ago
parent c8891a9542
commit 7a0222049d
  1. 1
      grpc.def
  2. 16
      include/grpc/support/log.h
  3. 6
      src/core/util/latent_see.cc
  4. 7
      src/core/util/log.cc
  5. 2
      src/core/util/ring_buffer.h
  6. 2
      src/ruby/ext/grpc/rb_grpc_imports.generated.c
  7. 3
      src/ruby/ext/grpc/rb_grpc_imports.generated.h
  8. 7
      test/core/util/ring_buffer_test.cc

1
grpc.def generated

@ -233,7 +233,6 @@ EXPORTS
gpr_log
gpr_should_log
gpr_log_verbosity_init
gpr_set_log_function
gpr_format_message
gpr_strdup
gpr_asprintf

@ -55,22 +55,6 @@ GPRAPI int gpr_should_log(gpr_log_severity severity);
GPRAPI void gpr_log_verbosity_init(void);
/** Log overrides: applications can use this API to intercept logging calls
and use their own implementations */
struct gpr_log_func_args {
const char* file;
int line;
gpr_log_severity severity;
const char* message;
};
typedef struct gpr_log_func_args gpr_log_func_args;
typedef void (*gpr_log_func)(gpr_log_func_args* args);
GPRAPI void gpr_set_log_function(gpr_log_func deprecated_setting);
#ifdef __cplusplus
}
#endif

@ -21,13 +21,13 @@
#include <string>
#include <vector>
#include "src/core/lib/gprpp/sync.h"
#include "src/core/util/ring_buffer.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "src/core/lib/gprpp/sync.h"
#include "src/core/util/ring_buffer.h"
namespace grpc_core {
namespace latent_see {

@ -119,10 +119,3 @@ void gpr_log_verbosity_init(void) {
}
#endif // GRPC_VERBOSITY_MACRO
}
void gpr_set_log_function([[maybe_unused]] gpr_log_func deprecated_setting) {
LOG(ERROR)
<< "This function is deprecated. This function will be deleted in the "
"next gRPC release. You may create a new absl LogSink with similar "
"functionality. gRFC: https://github.com/grpc/proposal/pull/425 ";
}

@ -50,7 +50,7 @@ class RingBuffer {
T operator*() { return buffer_->data_[head_]; }
RingBufferIterator() : buffer_(nullptr), head_(0), size_(0) {};
RingBufferIterator() : buffer_(nullptr), head_(0), size_(0){};
RingBufferIterator(const RingBufferIterator& other) = default;
RingBufferIterator(const RingBuffer<T, kCapacity>* buffer)
: buffer_(buffer), head_(buffer->head_), size_(buffer->size_) {

@ -256,7 +256,6 @@ gpr_cpu_current_cpu_type gpr_cpu_current_cpu_import;
gpr_log_type gpr_log_import;
gpr_should_log_type gpr_should_log_import;
gpr_log_verbosity_init_type gpr_log_verbosity_init_import;
gpr_set_log_function_type gpr_set_log_function_import;
gpr_format_message_type gpr_format_message_import;
gpr_strdup_type gpr_strdup_import;
gpr_asprintf_type gpr_asprintf_import;
@ -542,7 +541,6 @@ void grpc_rb_load_imports(HMODULE library) {
gpr_log_import = (gpr_log_type) GetProcAddress(library, "gpr_log");
gpr_should_log_import = (gpr_should_log_type) GetProcAddress(library, "gpr_should_log");
gpr_log_verbosity_init_import = (gpr_log_verbosity_init_type) GetProcAddress(library, "gpr_log_verbosity_init");
gpr_set_log_function_import = (gpr_set_log_function_type) GetProcAddress(library, "gpr_set_log_function");
gpr_format_message_import = (gpr_format_message_type) GetProcAddress(library, "gpr_format_message");
gpr_strdup_import = (gpr_strdup_type) GetProcAddress(library, "gpr_strdup");
gpr_asprintf_import = (gpr_asprintf_type) GetProcAddress(library, "gpr_asprintf");

@ -744,9 +744,6 @@ extern gpr_should_log_type gpr_should_log_import;
typedef void(*gpr_log_verbosity_init_type)(void);
extern gpr_log_verbosity_init_type gpr_log_verbosity_init_import;
#define gpr_log_verbosity_init gpr_log_verbosity_init_import
typedef void(*gpr_set_log_function_type)(gpr_log_func deprecated_setting);
extern gpr_set_log_function_type gpr_set_log_function_import;
#define gpr_set_log_function gpr_set_log_function_import
typedef char*(*gpr_format_message_type)(int messageid);
extern gpr_format_message_type gpr_format_message_import;
#define gpr_format_message gpr_format_message_import

@ -16,10 +16,11 @@
//
//
#include <grpc/support/port_platform.h>
#include "src/core/util/ring_buffer.h"
#include "gtest/gtest.h"
#include "src/core/util/ring_buffer.h"
#include <grpc/support/port_platform.h>
namespace grpc_core {
@ -29,7 +30,7 @@ TEST(RingBufferTest, BufferAppendPopTest) {
RingBuffer<int, kBufferCapacity> buffer;
EXPECT_FALSE(buffer.PopIfNotEmpty().has_value());
for (int i = 0; i < (3 * kBufferCapacity)/2; ++i) {
for (int i = 0; i < (3 * kBufferCapacity) / 2; ++i) {
buffer.Append(i);
}
// Pop half of the elements. Elements in [kBufferCapacity / 2,

Loading…
Cancel
Save