Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-18 03:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fd tests: move inline_cancelled out of file scope

Browse Source
This commit is contained in:
nick black 2021-05-01 22:11:09 -04:00
parent 5c85070345
commit 1218fbddf9
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tests/fds.cpp
View File

@ -9,7 +9,6 @@
static std::mutex lock; static std::mutex lock;
static std::condition_variable cond; static std::condition_variable cond;
static bool inline_cancelled = false;
auto testfdcb(struct ncfdplane* ncfd, const void* buf, size_t s, void* curry) -> int { auto testfdcb(struct ncfdplane* ncfd, const void* buf, size_t s, void* curry) -> int {
struct ncplane* n = ncfdplane_plane(ncfd); struct ncplane* n = ncfdplane_plane(ncfd);
@ -24,8 +23,8 @@ auto testfdcb(struct ncfdplane* ncfd, const void* buf, size_t s, void* curry) ->
} }
auto testfdeof(struct ncfdplane* n, int fderrno, void* curry) -> int { auto testfdeof(struct ncfdplane* n, int fderrno, void* curry) -> int {
std::unique_lock<std::mutex> lck(lock);
bool* outofline_cancelled = static_cast<bool*>(curry); bool* outofline_cancelled = static_cast<bool*>(curry);
std::unique_lock<std::mutex> lck(lock);
*outofline_cancelled = true; *outofline_cancelled = true;
lck.unlock(); lck.unlock();
cond.notify_one(); cond.notify_one();
@ -35,12 +34,12 @@ auto testfdeof(struct ncfdplane* n, int fderrno, void* curry) -> int {
} }
auto testfdeofdestroys(struct ncfdplane* n, int fderrno, void* curry) -> int { auto testfdeofdestroys(struct ncfdplane* n, int fderrno, void* curry) -> int {
bool* inline_cancelled = static_cast<bool*>(curry);
std::unique_lock<std::mutex> lck(lock); std::unique_lock<std::mutex> lck(lock);
inline_cancelled = true;
int ret = ncfdplane_destroy(n); int ret = ncfdplane_destroy(n);
*inline_cancelled = true;
lck.unlock(); lck.unlock();
cond.notify_one(); cond.notify_one();
(void)curry;
(void)fderrno; (void)fderrno;
return ret; return ret;
} }
@ -77,9 +76,9 @@ TEST_CASE("FdsAndSubprocs"
// destroy the ncfdplane within its own context, i.e. from the eof callback // destroy the ncfdplane within its own context, i.e. from the eof callback
SUBCASE("FdPlaneDestroyInline") { SUBCASE("FdPlaneDestroyInline") {
inline_cancelled = false; bool inline_cancelled = false;
ncfdplane_options opts{}; ncfdplane_options opts{};
opts.curry = n_; opts.curry = &inline_cancelled;
int fd = open("/dev/null", O_RDONLY|O_CLOEXEC); int fd = open("/dev/null", O_RDONLY|O_CLOEXEC);
REQUIRE(0 <= fd); REQUIRE(0 <= fd);
auto ncfdp = ncfdplane_create(n_, &opts, fd, testfdcb, testfdeofdestroys); auto ncfdp = ncfdplane_create(n_, &opts, fd, testfdcb, testfdeofdestroys);