| Index: third_party/grpc/src/ruby/ext/grpc/rb_channel_args.h
|
| diff --git a/third_party/tcmalloc/vendor/src/base/linuxthreads.h b/third_party/grpc/src/ruby/ext/grpc/rb_channel_args.h
|
| similarity index 67%
|
| copy from third_party/tcmalloc/vendor/src/base/linuxthreads.h
|
| copy to third_party/grpc/src/ruby/ext/grpc/rb_channel_args.h
|
| index 5c318fed7ec4c47e7bf082e315992e102abcd620..591dd848accd04940c9b43e6aa5a648c853289a1 100644
|
| --- a/third_party/tcmalloc/vendor/src/base/linuxthreads.h
|
| +++ b/third_party/grpc/src/ruby/ext/grpc/rb_channel_args.h
|
| @@ -1,4 +1,6 @@
|
| -/* Copyright (c) 2005-2007, Google Inc.
|
| +/*
|
| + *
|
| + * Copyright 2015, Google Inc.
|
| * All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| @@ -27,27 +29,25 @@
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| *
|
| - * ---
|
| - * Author: Markus Gutschke
|
| */
|
|
|
| -#ifndef _LINUXTHREADS_H
|
| -#define _LINUXTHREADS_H
|
| +#ifndef GRPC_RB_CHANNEL_ARGS_H_
|
| +#define GRPC_RB_CHANNEL_ARGS_H_
|
|
|
| -/* Include thread_lister.h to get the interface that we implement for linux.
|
| - */
|
| +#include <ruby/ruby.h>
|
|
|
| -/* We currently only support x86-32 and x86-64 on Linux. Porting to other
|
| - * related platforms should not be difficult.
|
| - */
|
| -#if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) || \
|
| - defined(__mips__) || defined(__PPC__)) && defined(__linux)
|
| +#include <grpc/grpc.h>
|
|
|
| -/* Define the THREADS symbol to make sure that there is exactly one core dumper
|
| - * built into the library.
|
| +/* Converts a hash object containing channel args to a channel args instance.
|
| + *
|
| + * This func ALLOCs args->args. The caller is responsible for freeing it. If
|
| + * a ruby error is raised during processing of the hash values, the func takes
|
| + * care to deallocate any memory allocated so far, and propagate the error.
|
| + *
|
| + * @param src_hash A ruby hash
|
| + * @param dst the grpc_channel_args that the hash entries will be added to.
|
| */
|
| -#define THREADS "Linux /proc"
|
| -
|
| -#endif
|
| +void grpc_rb_hash_convert_to_channel_args(VALUE src_hash,
|
| + grpc_channel_args* dst);
|
|
|
| -#endif /* _LINUXTHREADS_H */
|
| +#endif /* GRPC_RB_CHANNEL_ARGS_H_ */
|
|
|