Skip to content

Transfer timeouts to the right buckets and update the build.cake to support the configuration parameter #439

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

Merged
nayato merged 1 commit into from
Nov 1, 2018
Merged

Transfer timeouts to the right buckets and update the build.cake to support the configuration parameter #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ var version = Argument<string>("targetversion", $"{releaseNote.Version}.{buildNu
var skipClean = Argument<bool>("skipclean", false);
var skipTests = Argument<bool>("skiptests", false);
var nogit = Argument<bool>("nogit", false);
var config = Argument<string>("configuration", "Release");

// Variables
var configuration = IsRunningOnWindows() ? "Release" : "MonoRelease";
var configuration = IsRunningOnWindows() ? config : "MonoRelease";
var csProjectFiles = GetFiles("./src/**/*.csproj");

// Directories
Expand Down
2 changes: 1 addition & 1 deletion src/DotNetty.Common/Utilities/HashedWheelTimer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ void TransferTimeoutsToBuckets()
continue;
}

long calculated = (timeout.Deadline.Ticks + this.owner.tickDuration - 1) / this.owner.tickDuration; // ceiling to timeout later rather than earlier
long calculated = timeout.Deadline.Ticks / this.owner.tickDuration;
timeout.RemainingRounds = (calculated - this.tick) / this.owner.wheel.Length;

long ticks = Math.Max(calculated, this.tick); // Ensure we don't schedule for past.
Expand Down