Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin J. Thompson
Tor
Commits
4ecd5da3
Commit
4ecd5da3
authored
6 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
Add .may_include to ext/timeouts.
parent
d32795bb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/ext/timeouts/.may_include
+6
-0
6 additions, 0 deletions
src/ext/timeouts/.may_include
src/ext/timeouts/timeout.c
+2
-3
2 additions, 3 deletions
src/ext/timeouts/timeout.c
src/ext/timeouts/timeout.h
+2
-2
2 additions, 2 deletions
src/ext/timeouts/timeout.h
with
10 additions
and
5 deletions
src/ext/timeouts/.may_include
0 → 100644
+
6
−
0
View file @
4ecd5da3
orconfig.h
ext/tor_queue.h
timeout-bitops.c
timeout-debug.h
timeout.h
This diff is collapsed.
Click to expand it.
src/ext/timeouts/timeout.c
+
2
−
3
View file @
4ecd5da3
...
...
@@ -38,7 +38,7 @@
#include
<errno.h>
/* errno */
#include
"tor_queue.h"
/* TAILQ(3) */
#include
"
ext/
tor_queue.h"
/* TAILQ(3) */
#include
"timeout.h"
...
...
@@ -531,7 +531,7 @@ static timeout_t timeouts_int(struct timeouts *T) {
timeout
=
MIN
(
_timeout
,
timeout
);
}
relmask
<<=
WHEEL_BIT
;
relmask
<<=
WHEEL_BIT
;
relmask
|=
WHEEL_MASK
;
}
...
...
@@ -751,4 +751,3 @@ TIMEOUT_PUBLIC int timeout_v_abi(void) {
TIMEOUT_PUBLIC
int
timeout_v_api
(
void
)
{
return
TIMEOUT_V_API
;
}
/* timeout_version() */
This diff is collapsed.
Click to expand it.
src/ext/timeouts/timeout.h
+
2
−
2
View file @
4ecd5da3
...
...
@@ -31,7 +31,7 @@
#include
<inttypes.h>
/* PRIu64 PRIx64 PRIX64 uint64_t */
#include
"tor_queue.h"
/* TAILQ(3) */
#include
"
ext/
tor_queue.h"
/* TAILQ(3) */
/*
...
...
@@ -147,7 +147,7 @@ TIMEOUT_PUBLIC struct timeout *timeout_init(struct timeout *, int);
#ifndef TIMEOUT_DISABLE_RELATIVE_ACCESS
TIMEOUT_PUBLIC
bool
timeout_pending
(
struct
timeout
*
);
/* true if on timing wheel, false otherwise */
TIMEOUT_PUBLIC
bool
timeout_expired
(
struct
timeout
*
);
/* true if on expired queue, false otherwise */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment