pull/8086/head
Yuchen Zeng 8 years ago
parent b5869dc713
commit 362ac1be0c
  1. 2
      include/grpc++/impl/codegen/completion_queue.h
  2. 2
      include/grpc/impl/codegen/log.h
  3. 8
      include/grpc/impl/codegen/port_platform.h
  4. 2
      include/grpc/support/string_util.h
  5. 2
      src/core/ext/census/census_log.h
  6. 2
      src/core/ext/census/mlog.h
  7. 2
      src/core/lib/iomgr/ev_epoll_linux.c
  8. 4
      src/ruby/ext/grpc/rb_grpc_imports.generated.h
  9. 2
      test/core/profiling/mark_timings.stp

@ -241,7 +241,7 @@ class ServerCompletionQueue : public CompletionQueue {
private: private:
bool is_frequently_polled_; bool is_frequently_polled_;
friend class ServerBuilder; friend class ServerBuilder;
/// \param is_frequently_polled Informs the GPRC library about whether the /// \param is_frequently_polled Informs the GRPC library about whether the
/// server completion queue would be actively polled (by calling Next() or /// server completion queue would be actively polled (by calling Next() or
/// AsyncNext()). By default all server completion queues are assumed to be /// AsyncNext()). By default all server completion queues are assumed to be
/// frequently polled. /// frequently polled.

@ -75,7 +75,7 @@ const char *gpr_log_severity_string(gpr_log_severity severity);
/* Log a message. It's advised to use GPR_xxx above to generate the context /* Log a message. It's advised to use GPR_xxx above to generate the context
* for each message */ * for each message */
GPRAPI void gpr_log(const char *file, int line, gpr_log_severity severity, GPRAPI void gpr_log(const char *file, int line, gpr_log_severity severity,
const char *format, ...) GPRC_PRINT_FORMAT_CHECK(4, 5); const char *format, ...) GPR_PRINT_FORMAT_CHECK(4, 5);
GPRAPI void gpr_log_message(const char *file, int line, GPRAPI void gpr_log_message(const char *file, int line,
gpr_log_severity severity, const char *message); gpr_log_severity severity, const char *message);

@ -450,14 +450,14 @@ typedef unsigned __int64 uint64_t;
#endif #endif
#endif #endif
#ifndef GPRC_PRINT_FORMAT_CHECK #ifndef GPR_PRINT_FORMAT_CHECK
#ifdef __GNUC__ #ifdef __GNUC__
#define GPRC_PRINT_FORMAT_CHECK(FORMAT_STR, ARGS) \ #define GPR_PRINT_FORMAT_CHECK(FORMAT_STR, ARGS) \
__attribute__((format(printf, FORMAT_STR, ARGS))) __attribute__((format(printf, FORMAT_STR, ARGS)))
#else #else
#define GPRC_PRINT_FORMAT_CHECK(FORMAT_STR, ARGS) #define GPR_PRINT_FORMAT_CHECK(FORMAT_STR, ARGS)
#endif #endif
#endif /* GPRC_PRINT_FORMAT_CHECK */ #endif /* GPR_PRINT_FORMAT_CHECK */
#if GPR_FORBID_UNREACHABLE_CODE #if GPR_FORBID_UNREACHABLE_CODE
#define GPR_UNREACHABLE_CODE(STATEMENT) #define GPR_UNREACHABLE_CODE(STATEMENT)

@ -55,7 +55,7 @@ GPRAPI char *gpr_strdup(const char *src);
On error, returns -1 and sets *strp to NULL. If the format string is bad, On error, returns -1 and sets *strp to NULL. If the format string is bad,
the result is undefined. */ the result is undefined. */
GPRAPI int gpr_asprintf(char **strp, const char *format, ...) GPRAPI int gpr_asprintf(char **strp, const char *format, ...)
GPRC_PRINT_FORMAT_CHECK(2, 3); GPR_PRINT_FORMAT_CHECK(2, 3);
#ifdef __cplusplus #ifdef __cplusplus
} }

@ -84,7 +84,7 @@ const void *census_log_read_next(size_t *bytes_available);
*/ */
size_t census_log_remaining_space(void); size_t census_log_remaining_space(void);
/* Returns the number of times gprc_stats_log_start_write() failed due to /* Returns the number of times grpc_stats_log_start_write() failed due to
out-of-space. */ out-of-space. */
int census_log_out_of_space_count(void); int census_log_out_of_space_count(void);

@ -88,7 +88,7 @@ const void* census_log_read_next(size_t* bytes_available);
*/ */
size_t census_log_remaining_space(void); size_t census_log_remaining_space(void);
/* Returns the number of times gprc_stats_log_start_write() failed due to /* Returns the number of times grpc_stats_log_start_write() failed due to
out-of-space. */ out-of-space. */
int64_t census_log_out_of_space_count(void); int64_t census_log_out_of_space_count(void);

@ -164,7 +164,7 @@ static void fd_global_shutdown(void);
#define PI_ADD_REF(p, r) pi_add_ref((p)) #define PI_ADD_REF(p, r) pi_add_ref((p))
#define PI_UNREF(exec_ctx, p, r) pi_unref((exec_ctx), (p)) #define PI_UNREF(exec_ctx, p, r) pi_unref((exec_ctx), (p))
#endif /* !defined(GPRC_PI_REF_COUNT_DEBUG) */ #endif /* !defined(GRPC_PI_REF_COUNT_DEBUG) */
typedef struct polling_island { typedef struct polling_island {
gpr_mu mu; gpr_mu mu;

@ -473,7 +473,7 @@ extern grpc_byte_buffer_reader_readall_type grpc_byte_buffer_reader_readall_impo
typedef grpc_byte_buffer *(*grpc_raw_byte_buffer_from_reader_type)(grpc_byte_buffer_reader *reader); typedef grpc_byte_buffer *(*grpc_raw_byte_buffer_from_reader_type)(grpc_byte_buffer_reader *reader);
extern grpc_raw_byte_buffer_from_reader_type grpc_raw_byte_buffer_from_reader_import; extern grpc_raw_byte_buffer_from_reader_type grpc_raw_byte_buffer_from_reader_import;
#define grpc_raw_byte_buffer_from_reader grpc_raw_byte_buffer_from_reader_import #define grpc_raw_byte_buffer_from_reader grpc_raw_byte_buffer_from_reader_import
typedef void(*gpr_log_type)(const char *file, int line, gpr_log_severity severity, const char *format, ...) GPRC_PRINT_FORMAT_CHECK(4, 5); typedef void(*gpr_log_type)(const char *file, int line, gpr_log_severity severity, const char *format, ...) GPR_PRINT_FORMAT_CHECK(4, 5);
extern gpr_log_type gpr_log_import; extern gpr_log_type gpr_log_import;
#define gpr_log gpr_log_import #define gpr_log gpr_log_import
typedef void(*gpr_log_message_type)(const char *file, int line, gpr_log_severity severity, const char *message); typedef void(*gpr_log_message_type)(const char *file, int line, gpr_log_severity severity, const char *message);
@ -821,7 +821,7 @@ extern gpr_format_message_type gpr_format_message_import;
typedef char *(*gpr_strdup_type)(const char *src); typedef char *(*gpr_strdup_type)(const char *src);
extern gpr_strdup_type gpr_strdup_import; extern gpr_strdup_type gpr_strdup_import;
#define gpr_strdup gpr_strdup_import #define gpr_strdup gpr_strdup_import
typedef int(*gpr_asprintf_type)(char **strp, const char *format, ...) GPRC_PRINT_FORMAT_CHECK(2, 3); typedef int(*gpr_asprintf_type)(char **strp, const char *format, ...) GPR_PRINT_FORMAT_CHECK(2, 3);
extern gpr_asprintf_type gpr_asprintf_import; extern gpr_asprintf_type gpr_asprintf_import;
#define gpr_asprintf gpr_asprintf_import #define gpr_asprintf gpr_asprintf_import
typedef const char *(*gpr_subprocess_binary_extension_type)(); typedef const char *(*gpr_subprocess_binary_extension_type)();

@ -2,7 +2,7 @@
* probe definition. * probe definition.
* *
* For a statically build binary, that'd be the name of the binary itself. * For a statically build binary, that'd be the name of the binary itself.
* For dinamically built ones, point to the location of the libgprc.so being * For dinamically built ones, point to the location of the libgrpc.so being
* used. */ * used. */
global starts, times, times_per_tag global starts, times, times_per_tag

Loading…
Cancel
Save