| Index: third_party/grpc/src/python/grpcio/grpc/_cython/loader.h
|
| diff --git a/third_party/tcmalloc/vendor/src/base/spinlock_win32-inl.h b/third_party/grpc/src/python/grpcio/grpc/_cython/loader.h
|
| similarity index 76%
|
| copy from third_party/tcmalloc/vendor/src/base/spinlock_win32-inl.h
|
| copy to third_party/grpc/src/python/grpcio/grpc/_cython/loader.h
|
| index 64decd267240a384c66e4cd556f70df8e8f33b54..3b8796d39f7d3ba0b880f5f4405d16501d50e2b7 100644
|
| --- a/third_party/tcmalloc/vendor/src/base/spinlock_win32-inl.h
|
| +++ b/third_party/grpc/src/python/grpcio/grpc/_cython/loader.h
|
| @@ -1,10 +1,12 @@
|
| -/* Copyright (c) 2009, Google Inc.
|
| +/*
|
| + *
|
| + * Copyright 2016, Google Inc.
|
| * All rights reserved.
|
| - *
|
| + *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| * met:
|
| - *
|
| + *
|
| * * Redistributions of source code must retain the above copyright
|
| * notice, this list of conditions and the following disclaimer.
|
| * * Redistributions in binary form must reproduce the above
|
| @@ -14,7 +16,7 @@
|
| * * Neither the name of Google Inc. nor the names of its
|
| * contributors may be used to endorse or promote products derived from
|
| * this software without specific prior written permission.
|
| - *
|
| + *
|
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| @@ -27,27 +29,26 @@
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| *
|
| - * ---
|
| - * This file is a Win32-specific part of spinlock_internal.cc
|
| */
|
|
|
| +#ifndef PYGRPC_LOADER_H_
|
| +#define PYGRPC_LOADER_H_
|
|
|
| -#include <windows.h>
|
| +#include "imports.generated.h"
|
|
|
| -namespace base {
|
| -namespace internal {
|
| +/* Additional inclusions not covered by "imports.generated.h" */
|
| +#include <grpc/byte_buffer_reader.h>
|
|
|
| -void SpinLockDelay(volatile Atomic32 *w, int32 value, int loop) {
|
| - if (loop == 0) {
|
| - } else if (loop == 1) {
|
| - Sleep(0);
|
| - } else {
|
| - Sleep(base::internal::SuggestedDelayNS(loop) / 1000000);
|
| - }
|
| -}
|
| +#ifdef __cplusplus
|
| +extern "C" {
|
| +#endif /* __cpluslus */
|
| +
|
| +/* Attempts to load the core if necessary, and return non-zero upon succes. */
|
| +int pygrpc_load_core(char *path);
|
|
|
| -void SpinLockWake(volatile Atomic32 *w, bool all) {
|
| +#ifdef __cplusplus
|
| }
|
| +#endif /* __cpluslus */
|
| +
|
| +#endif /* GRPC_RB_BYTE_BUFFER_H_ */
|
|
|
| -} // namespace internal
|
| -} // namespace base
|
|
|