Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f86413ec
Commit
f86413ec
authored
Nov 13, 2017
by
David Carlier
Committed by
Sergei Golubchik
Nov 22, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the build on OpenBSD (#488)
* rocksdb fails without timer_delete() - only use it when it exists
parent
14c2a9a5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
storage/rocksdb/CMakeLists.txt
storage/rocksdb/CMakeLists.txt
+5
-0
storage/rocksdb/rdb_io_watchdog.cc
storage/rocksdb/rdb_io_watchdog.cc
+1
-1
storage/rocksdb/rdb_io_watchdog.h
storage/rocksdb/rdb_io_watchdog.h
+1
-1
No files found.
storage/rocksdb/CMakeLists.txt
View file @
f86413ec
...
@@ -9,6 +9,11 @@ IF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/Makefile")
...
@@ -9,6 +9,11 @@ IF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/Makefile")
SKIP_ROCKSDB_PLUGIN
(
"Missing Makefile in rocksdb directory. Try
\"
git submodule update
\"
."
)
SKIP_ROCKSDB_PLUGIN
(
"Missing Makefile in rocksdb directory. Try
\"
git submodule update
\"
."
)
ENDIF
()
ENDIF
()
CHECK_LIBRARY_EXISTS
(
rt timer_delete
""
HAVE_TIMER_DELETE
)
IF
(
HAVE_TIMER_DELETE
)
ADD_DEFINITIONS
(
-DHAVE_TIMER_DELETE
)
ENDIF
(
HAVE_TIMER_DELETE
)
CHECK_FUNCTION_EXISTS
(
sched_getcpu HAVE_SCHED_GETCPU
)
CHECK_FUNCTION_EXISTS
(
sched_getcpu HAVE_SCHED_GETCPU
)
IF
(
HAVE_SCHED_GETCPU
)
IF
(
HAVE_SCHED_GETCPU
)
ADD_DEFINITIONS
(
-DHAVE_SCHED_GETCPU=1 -DROCKSDB_SCHED_GETCPU_PRESENT
)
ADD_DEFINITIONS
(
-DHAVE_SCHED_GETCPU=1 -DROCKSDB_SCHED_GETCPU_PRESENT
)
...
...
storage/rocksdb/rdb_io_watchdog.cc
View file @
f86413ec
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include <vector>
#include <vector>
/* Rdb_io_watchdog doesn't work on Windows [yet] */
/* Rdb_io_watchdog doesn't work on Windows [yet] */
#if
!defined(_WIN32) && !defined(__APPLE__)
#if
def HAVE_TIMER_DELETE
namespace
myrocks
{
namespace
myrocks
{
...
...
storage/rocksdb/rdb_io_watchdog.h
View file @
f86413ec
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
namespace
myrocks
{
namespace
myrocks
{
// Rdb_io_watchdog does not support Windows ATM.
// Rdb_io_watchdog does not support Windows ATM.
#if
!defined(_WIN32) && !defined(__APPLE__)
#if
def HAVE_TIMER_DELETE
class
Rdb_io_watchdog
{
class
Rdb_io_watchdog
{
const
int
RDB_IO_WRITE_BUFFER_SIZE
=
4096
;
const
int
RDB_IO_WRITE_BUFFER_SIZE
=
4096
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment