wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-08-13 12:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some nonstandard code (#9172)

Browse Source 
Co-authored-by: Mehrdad <noreply@github.com>
This commit is contained in:
mehrdadn
2020-06-28 00:22:52 -07:00
committed by GitHub
co-authored by Mehrdad
parent a268277f38
commit aac40af948
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/common/id.cc
+4 -4
View File
@@ -71,22 +71,22 @@ constexpr ObjectIDFlagsType kObjectTypeFlagBitMask = 0x1 << kObjectTypeBitsOffse
inline void SetCreatedByTaskFlag(bool created_by_task, ObjectIDFlagsType *flags) {
const ObjectIDFlagsType object_type_bits =
static_cast<ObjectIDFlagsType>(created_by_task) << kCreatedByTaskBitsOffset;
*flags = (*flags bitor object_type_bits);
*flags = (*flags | object_type_bits);
}
inline void SetObjectTypeFlag(ObjectType object_type, ObjectIDFlagsType *flags) {
const ObjectIDFlagsType object_type_bits = static_cast<ObjectIDFlagsType>(object_type)
<< kObjectTypeBitsOffset;
*flags = (*flags bitor object_type_bits);
*flags = (*flags | object_type_bits);
}
inline bool CreatedByTask(ObjectIDFlagsType flags) {
return ((flags bitand kCreatedByTaskFlagBitMask) >> kCreatedByTaskBitsOffset) != 0x0;
return ((flags & kCreatedByTaskFlagBitMask) >> kCreatedByTaskBitsOffset) != 0x0;
}
inline ObjectType GetObjectType(ObjectIDFlagsType flags) {
const ObjectIDFlagsType object_type =
(flags bitand kObjectTypeFlagBitMask) >> kObjectTypeBitsOffset;
(flags & kObjectTypeFlagBitMask) >> kObjectTypeBitsOffset;
return static_cast<ObjectType>(object_type);
}
src/ray/gcs/redis_module/redismodule.h
+2 -3
View File
@@ -295,9 +295,8 @@ int REDISMODULE_API_FUNC(RedisModule_AbortBlock)(RedisModuleBlockedClient *bc);
long long REDISMODULE_API_FUNC(RedisModule_Milliseconds)(void);
/* This is included inline inside each Redis module. */
static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int apiver)
__attribute__((unused));
static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int apiver) {
static inline int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver,
int apiver) {
void *getapifuncptr = ((void **)ctx)[0];
RedisModule_GetApi = (int (*)(const char *, void *))getapifuncptr;
REDISMODULE_GET_API(Alloc);
src/ray/rpc/grpc_client.h
+2 -4
View File
@@ -28,10 +28,8 @@ namespace rpc {
// This macro wraps the logic to call a specific RPC method of a service,
// to make it easier to implement a new RPC client.
#define INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client) \
({ \
rpc_client->CallMethod<METHOD##Request, METHOD##Reply>( \
&SERVICE::Stub::PrepareAsync##METHOD, request, callback); \
})
(rpc_client->CallMethod<METHOD##Request, METHOD##Reply>( \
&SERVICE::Stub::PrepareAsync##METHOD, request, callback))
// Define a void RPC client method.
#define VOID_RPC_CLIENT_METHOD(SERVICE, METHOD, rpc_client, SPECS) \
src/shims/windows/msg.cc
+1
View File
@@ -1,3 +1,4 @@
#include <malloc.h>
#include <stdlib.h>
#include <sys/socket.h>