Skip to content

Commit cd6b4f4

Browse files
authored
Reflect libnv, liblpm and libqsbr changes. (#36)
1 parent d60afdb commit cd6b4f4

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ install:
1111
# build essentials
1212
- sudo apt-get install -y build-essential fakeroot debhelper
1313
- sudo apt-get install -y make libtool libjemalloc-dev libpcap-dev
14-
- sudo apt-get install -y byacc flex
14+
- sudo apt-get install -y byacc flex liblua5.1-0-dev
1515
# libnv
1616
- git clone https://github.com/rmind/nvlist
1717
- (cd nvlist/pkg && make deb && sudo dpkg -i ../libnv*.deb)

src/kern/stand/npf_stand.h

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -139,26 +139,11 @@ npfkern_pthread_cond_timedwait(pthread_cond_t *t, pthread_mutex_t *l,
139139
*/
140140
typedef ebr_t * pserialize_t;
141141

142-
static inline void
143-
npfkern_ebr_wait(ebr_t *ebr)
144-
{
145-
const struct timespec dtime = { 0, 1 * 1000 * 1000 }; /* 1 ms */
146-
unsigned epoch, count = SPINLOCK_BACKOFF_MIN;
147-
148-
while (!ebr_sync(ebr, &epoch)) {
149-
if (count < SPINLOCK_BACKOFF_MAX) {
150-
SPINLOCK_BACKOFF(count);
151-
} else {
152-
(void)nanosleep(&dtime, NULL);
153-
}
154-
}
155-
}
156-
157142
#define pserialize_create() ebr_create()
158143
#define pserialize_destroy(p) ebr_destroy(p)
159144
#define pserialize_register(p) ebr_register(p)
160145
#define pserialize_unregister(p) ebr_unregister(p)
161-
#define pserialize_perform(p) npfkern_ebr_wait(p)
146+
#define pserialize_perform(p) ebr_full_sync(p, 1)
162147
#define pserialize_read_enter() NPF_DIAG_MAGIC_VAL
163148
#ifdef NDEBUG
164149
#define pserialize_read_exit(s) (void)(s);

0 commit comments

Comments
 (0)