Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed legacy macros completely (#31248)

Browse Source 
* Removed legacy macros

* Removed GRPC_ERROR_NONE;

* Fix CFStreamClientTests.mm
pull/31273/head
Esun Kim 3 years ago committed by GitHub
parent dc3e7a3f0d
commit ae471418e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 147
      src/core/lib/iomgr/error.h
  2. 2
      test/core/iomgr/ios/CFStreamTests/CFStreamClientTests.mm
  3. 2
      test/core/xds/xds_cluster_resource_type_test.cc
  4. 2
      test/core/xds/xds_common_types_test.cc

147
src/core/lib/iomgr/error.h
Unescape View File

@ -42,118 +42,11 @@
typedef absl::Status grpc_error_handle;
/// TODO(veblush): Remove this enum once migration is done
typedef enum {
/// 'errno' from the operating system
GRPC_ERROR_INT_ERRNO =
static_cast<int>(grpc_core::StatusIntProperty::kErrorNo),
/// __LINE__ from the call site creating the error
GRPC_ERROR_INT_FILE_LINE =
static_cast<int>(grpc_core::StatusIntProperty::kFileLine),
/// stream identifier: for errors that are associated with an individual
/// wire stream
GRPC_ERROR_INT_STREAM_ID =
static_cast<int>(grpc_core::StatusIntProperty::kStreamId),
/// grpc status code representing this error
GRPC_ERROR_INT_GRPC_STATUS =
static_cast<int>(grpc_core::StatusIntProperty::kRpcStatus),
/// offset into some binary blob (usually represented by
/// GRPC_ERROR_STR_RAW_BYTES) where the error occurred
GRPC_ERROR_INT_OFFSET =
static_cast<int>(grpc_core::StatusIntProperty::kOffset),
/// context sensitive index associated with the error
GRPC_ERROR_INT_INDEX = static_cast<int>(grpc_core::StatusIntProperty::kIndex),
/// context sensitive size associated with the error
GRPC_ERROR_INT_SIZE = static_cast<int>(grpc_core::StatusIntProperty::kSize),
/// http2 error code associated with the error (see the HTTP2 RFC)
GRPC_ERROR_INT_HTTP2_ERROR =
static_cast<int>(grpc_core::StatusIntProperty::kHttp2Error),
/// TSI status code associated with the error
GRPC_ERROR_INT_TSI_CODE =
static_cast<int>(grpc_core::StatusIntProperty::kTsiCode),
/// WSAGetLastError() reported when this error occurred
GRPC_ERROR_INT_WSA_ERROR =
static_cast<int>(grpc_core::StatusIntProperty::kWsaError),
/// File descriptor associated with this error
GRPC_ERROR_INT_FD = static_cast<int>(grpc_core::StatusIntProperty::kFd),
/// HTTP status (i.e. 404)
GRPC_ERROR_INT_HTTP_STATUS =
static_cast<int>(grpc_core::StatusIntProperty::kHttpStatus),
/// chttp2: did the error occur while a write was in progress
GRPC_ERROR_INT_OCCURRED_DURING_WRITE =
static_cast<int>(grpc_core::StatusIntProperty::kOccurredDuringWrite),
/// channel connectivity state associated with the error
GRPC_ERROR_INT_CHANNEL_CONNECTIVITY_STATE =
static_cast<int>(grpc_core::StatusIntProperty::ChannelConnectivityState),
/// LB policy drop
GRPC_ERROR_INT_LB_POLICY_DROP =
static_cast<int>(grpc_core::StatusIntProperty::kLbPolicyDrop),
/// Must always be last
GRPC_ERROR_INT_MAX,
} grpc_error_ints;
/// TODO(veblush): Remove this enum once migration is done
typedef enum {
/// top-level textual description of this error
GRPC_ERROR_STR_DESCRIPTION =
static_cast<int>(grpc_core::StatusStrProperty::kDescription),
/// source file in which this error occurred
GRPC_ERROR_STR_FILE = static_cast<int>(grpc_core::StatusStrProperty::kFile),
/// operating system description of this error
GRPC_ERROR_STR_OS_ERROR =
static_cast<int>(grpc_core::StatusStrProperty::kOsError),
/// syscall that generated this error
GRPC_ERROR_STR_SYSCALL =
static_cast<int>(grpc_core::StatusStrProperty::kSyscall),
/// peer that we were trying to communicate when this error occurred
GRPC_ERROR_STR_TARGET_ADDRESS =
static_cast<int>(grpc_core::StatusStrProperty::kTargetAddress),
/// grpc status message associated with this error
GRPC_ERROR_STR_GRPC_MESSAGE =
static_cast<int>(grpc_core::StatusStrProperty::kGrpcMessage),
/// hex dump (or similar) with the data that generated this error
GRPC_ERROR_STR_RAW_BYTES =
static_cast<int>(grpc_core::StatusStrProperty::kRawBytes),
/// tsi error string associated with this error
GRPC_ERROR_STR_TSI_ERROR =
static_cast<int>(grpc_core::StatusStrProperty::kTsiError),
/// filename that we were trying to read/write when this error occurred
GRPC_ERROR_STR_FILENAME =
static_cast<int>(grpc_core::StatusStrProperty::kFilename),
/// key associated with the error
GRPC_ERROR_STR_KEY = static_cast<int>(grpc_core::StatusStrProperty::kKey),
/// value associated with the error
GRPC_ERROR_STR_VALUE = static_cast<int>(grpc_core::StatusStrProperty::kValue),
/// Must always be last
GRPC_ERROR_STR_MAX,
} grpc_error_strs;
std::string grpc_error_std_string(grpc_error_handle error);
#define GRPC_ERROR_NONE absl::OkStatus()
#define GRPC_ERROR_OOM absl::Status(absl::ResourceExhaustedError(""))
#define GRPC_ERROR_CANCELLED absl::CancelledError()
// Deprecated: Please do not use these macros.
// These will be removed once migration is done.
#define GRPC_ERROR_REF(err) (err)
#define GRPC_ERROR_UNREF(err) (void)(err)
#define GRPC_ERROR_IS_NONE(err) (err).ok()
#define GRPC_ERROR_CREATE(desc) \
StatusCreate(absl::StatusCode::kUnknown, desc, DEBUG_LOCATION, {})
// Deprecated: Please do not use these macros. begin
// TODO(veblush): Remove this once migration is done.
#define GRPC_ERROR_CREATE_FROM_STATIC_STRING(desc) GRPC_ERROR_CREATE(desc)
#define GRPC_ERROR_CREATE_FROM_COPIED_STRING(desc) GRPC_ERROR_CREATE(desc)
#define GRPC_ERROR_CREATE_FROM_CPP_STRING(desc) GRPC_ERROR_CREATE(desc)
#define GRPC_ERROR_CREATE_FROM_STRING_VIEW(desc) GRPC_ERROR_CREATE(desc)
// Deprecated: end
absl::Status grpc_status_create(absl::StatusCode code, absl::string_view msg,
const grpc_core::DebugLocation& location,
size_t children_count,
@ -164,14 +57,6 @@ absl::Status grpc_status_create(absl::StatusCode code, absl::string_view msg,
grpc_status_create(absl::StatusCode::kUnknown, desc, DEBUG_LOCATION, count, \
errs)
// Deprecated: Please do not use these macros. begin
// TODO(veblush): Remove this once migration is done.
#define GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(desc, errs, count) \
GRPC_ERROR_CREATE_REFERENCING(desc, errs, count)
#define GRPC_ERROR_CREATE_REFERENCING_FROM_COPIED_STRING(desc, errs, count) \
GRPC_ERROR_CREATE_REFERENCING(desc, errs, count)
// Deprecated: end
// Consumes all the errors in the vector and forms a referencing error from
// them. If the vector is empty, return absl::OkStatus().
template <typename VectorType>
@ -190,12 +75,6 @@ static absl::Status grpc_status_create_from_vector(
#define GRPC_ERROR_CREATE_FROM_VECTOR(desc, error_list) \
grpc_status_create_from_vector(DEBUG_LOCATION, desc, error_list)
// Deprecated: Please do not use these macros. begin
// TODO(veblush): Remove this once migration is done.
#define GRPC_ERROR_CREATE_FROM_VECTOR_AND_CPP_STRING(desc, error_list) \
GRPC_ERROR_CREATE_FROM_VECTOR(desc, error_list)
// Deprecated: end
absl::Status grpc_os_error(const grpc_core::DebugLocation& location, int err,
const char* call_name) GRPC_MUST_USE_RESULT;
@ -229,32 +108,6 @@ grpc_error_handle grpc_error_set_str(
bool grpc_error_get_str(grpc_error_handle error,
grpc_core::StatusStrProperty which, std::string* str);
/// TODO(veblush): Remove these functions once migration is done
/// PLEASE DON'T USE: begin
inline grpc_error_handle grpc_error_set_int(grpc_error_handle src,
grpc_error_ints which,
intptr_t value) {
return grpc_error_set_int(
src, static_cast<grpc_core::StatusIntProperty>(which), value);
}
inline bool grpc_error_get_int(grpc_error_handle error, grpc_error_ints which,
intptr_t* p) {
return grpc_error_get_int(
error, static_cast<grpc_core::StatusIntProperty>(which), p);
}
inline grpc_error_handle grpc_error_set_str(grpc_error_handle src,
grpc_error_strs which,
absl::string_view str) {
return grpc_error_set_str(
src, static_cast<grpc_core::StatusStrProperty>(which), str);
}
inline bool grpc_error_get_str(grpc_error_handle error, grpc_error_strs which,
std::string* str) {
return grpc_error_get_str(
error, static_cast<grpc_core::StatusStrProperty>(which), str);
}
/// PLEASE DON'T USE: end
/// Add a child error: an error that is believed to have contributed to this
/// error occurring. Allows root causing high level errors from lower level
/// errors that contributed to them. The src error takes ownership of the

2
test/core/iomgr/ios/CFStreamTests/CFStreamClientTests.mm
Unescape View File

@ -50,7 +50,7 @@ static void finish_connection() {
static void must_succeed(void* arg, grpc_error_handle error) {
GPR_ASSERT(g_connecting != nullptr);
GPR_ASSERT(error.ok());
grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE_FROM_STATIC_STRING("must_succeed called"));
grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE("must_succeed called"));
grpc_endpoint_destroy(g_connecting);
g_connecting = nullptr;
finish_connection();

2
test/core/xds/xds_cluster_resource_type_test.cc
Unescape View File

@ -74,7 +74,7 @@ class XdsClusterTest : public ::testing::Test {
upb_def_pool_.ptr(), upb_arena_.ptr()} {}
static RefCountedPtr<XdsClient> MakeXdsClient() {
grpc_error_handle error = GRPC_ERROR_NONE;
grpc_error_handle error;
auto bootstrap = GrpcXdsBootstrap::Create(
"{\n"
" \"xds_servers\": [\n"

2
test/core/xds/xds_common_types_test.cc
Unescape View File

@ -69,7 +69,7 @@ class XdsCommonTypesTest : public ::testing::Test {
upb_arena_.ptr()} {}
static RefCountedPtr<XdsClient> MakeXdsClient() {
grpc_error_handle error = GRPC_ERROR_NONE;
grpc_error_handle error;
auto bootstrap = GrpcXdsBootstrap::Create(
"{\n"
" \"xds_servers\": [\n"

Write Preview
Loading…
Cancel
Save