Change MuJoCo engine source code function-spacing convention from 3 blank lines to 2
PiperOrigin-RevId: 813754244 Change-Id: I6836e41c3b021cb727e922c25c60f629b9814c93
This commit is contained in:
committed by
Copybara-Service
parent
c439628f82
commit
edbdb5195c
@@ -76,7 +76,6 @@ static void maybe_unlock_alloc_mutex(mjData* d) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
static inline mjStackInfo get_stack_info_from_data(const mjData* d) {
|
||||
mjStackInfo stack_info;
|
||||
stack_info.bottom = (uintptr_t)d->arena + (uintptr_t)d->narena;
|
||||
@@ -225,7 +224,6 @@ static inline void* stackallocinternal(mjData* d, mjStackInfo* stack_info, size_
|
||||
}
|
||||
|
||||
|
||||
|
||||
// internal: allocate size bytes in mjData
|
||||
// declared inline so that modular arithmetic with specific alignments can be optimized out
|
||||
static inline void* stackalloc(mjData* d, size_t size, size_t alignment,
|
||||
@@ -245,7 +243,6 @@ static inline void* stackalloc(mjData* d, size_t size, size_t alignment,
|
||||
}
|
||||
|
||||
|
||||
|
||||
// mjStackInfo mark stack frame, inline so ASAN errors point to correct code unit
|
||||
#ifdef ADDRESS_SANITIZER
|
||||
__attribute__((always_inline))
|
||||
@@ -264,7 +261,6 @@ static inline void markstackinternal(mjData* d, mjStackInfo* stack_info) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
// mjData mark stack frame
|
||||
#ifndef ADDRESS_SANITIZER
|
||||
void mj_markStack(mjData* d)
|
||||
@@ -286,7 +282,6 @@ void mj__markStack(mjData* d)
|
||||
}
|
||||
|
||||
|
||||
|
||||
#ifdef ADDRESS_SANITIZER
|
||||
__attribute__((always_inline))
|
||||
#endif
|
||||
@@ -316,7 +311,6 @@ static inline void freestackinternal(mjStackInfo* stack_info) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
// mjData free stack frame
|
||||
#ifndef ADDRESS_SANITIZER
|
||||
void mj_freeStack(mjData* d)
|
||||
@@ -338,7 +332,6 @@ void mj__freeStack(mjData* d)
|
||||
}
|
||||
|
||||
|
||||
|
||||
// returns the number of bytes available on the stack
|
||||
size_t mj_stackBytesAvailable(mjData* d) {
|
||||
if (!d->threadpool) {
|
||||
@@ -352,14 +345,12 @@ size_t mj_stackBytesAvailable(mjData* d) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
// allocate bytes on the stack
|
||||
void* mj_stackAllocByte(mjData* d, size_t bytes, size_t alignment) {
|
||||
return stackalloc(d, bytes, alignment, NULL, 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// allocate bytes on the stack, with caller information
|
||||
void* mj_stackAllocInfo(mjData* d, size_t bytes, size_t alignment,
|
||||
const char* caller, int line) {
|
||||
@@ -367,7 +358,6 @@ void* mj_stackAllocInfo(mjData* d, size_t bytes, size_t alignment,
|
||||
}
|
||||
|
||||
|
||||
|
||||
// allocate mjtNums on the stack
|
||||
mjtNum* mj_stackAllocNum(mjData* d, size_t size) {
|
||||
if (mjUNLIKELY(size >= SIZE_MAX / sizeof(mjtNum))) {
|
||||
@@ -377,7 +367,6 @@ mjtNum* mj_stackAllocNum(mjData* d, size_t size) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
// allocate ints on the stack
|
||||
int* mj_stackAllocInt(mjData* d, size_t size) {
|
||||
if (mjUNLIKELY(size >= SIZE_MAX / sizeof(int))) {
|
||||
|
||||
Reference in New Issue
Block a user