Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.2.2 patches #239

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

1.2.2 patches #239

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
730f562
Merge remote-tracking branch 'origin/mv-compact-inversion' into 1.2.2…
Aug 24, 2012
22b2db8
Merge remote-tracking branch 'origin/mv-limit-repair' into 1.2.2-patches
Aug 24, 2012
07c95b6
Adjust cache release logic when initial pointer has lowest timestamp …
Aug 23, 2012
e477211
merge errors since this was cherry-picked from master
Sep 6, 2012
80911d9
fix error due to missed change on master that is not on this branch
Sep 6, 2012
824a1bb
Correct an incorrect correction made during cherry-pick. Funny what …
Sep 6, 2012
7a80c10
Adjust the polling timeout from 5 to 1 per customer feedback.
Sep 6, 2012
420f4b5
Update db_impl.cc and env_posix.cc so that they will compile on apple…
Sep 7, 2012
cd3bcc8
Internet was wrong on how to set feature test for clock_nanosleep. L…
Sep 7, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Internet was wrong on how to set feature test for clock_nanosleep. La… 
…st time I use Internet for technical data.
  • Loading branch information
Matthew V committed Sep 7, 2012
commit cd3bcc898a8702dcab602ab4b4bea7f7d71a10b5
4 changes: 2 additions & 2 deletions util/env_posix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ class PosixEnv : public Env {

do
{
#if _POSIX_TIMERS > 0L
#if _POSIX_TIMERS >= 200801L
// later ... add test for CLOCK_MONOTONIC_RAW where supported (better)
ret_val=clock_nanosleep(CLOCK_MONOTONIC,0, &ts, &ts);
#else
Expand Down Expand Up @@ -664,7 +664,7 @@ PosixEnv::PosixEnv() : page_size_(getpagesize()),
{
struct timespec ts;

#if _POSIX_TIMERS > 0L
#if _POSIX_TIMERS >= 200801L
clock_getres(CLOCK_MONOTONIC, &ts);
clock_res_=ts.tv_sec*1000000+ts.tv_nsec/1000;
if (0==clock_res_)
Expand Down