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

Actually enable UDP. Also fix some UWYI includes. #1883

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Actually enable UDP. Also fix some UWYI includes. #1883

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
6 changes: 4 additions & 2 deletions src/core/defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
#ifndef CORE_DEFS_H
#define CORE_DEFS_H

#include <stdint.h>
#include <stdbool.h>
#include <stdint.h>

#include <nng/nng.h>

// C compilers may get unhappy when named arguments are not used. While
// there are things like __attribute__((unused)) which are arguably
Expand All @@ -24,7 +26,7 @@
if (!(x)) \
nni_panic("%s: %d: assert err: %s", __FILE__, __LINE__, #x)
#else
#define NNI_ASSERT(x) ((void)(0))
#define NNI_ASSERT(x) ((void) (0))
#endif

// Returns the size of an array in elements. (Convenience.)
Expand Down
7 changes: 4 additions & 3 deletions src/core/taskq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#include "core/defs.h"
#include "core/list.h"
#include "core/platform.h"

typedef struct nni_taskq nni_taskq;
typedef struct nni_task nni_task;
Expand Down Expand Up @@ -51,7 +52,7 @@ extern bool nni_task_busy(nni_task *);
// work is scheduled on the task then it will not return until that
// work (or any other work subsequently scheduled) is complete.
extern void nni_task_wait(nni_task *);
extern void nni_task_init(nni_task *, nni_taskq *, nni_cb, void *);
extern void nni_task_init(nni_task *, nni_taskq *, nni_cb, void *);

// nni_task_fini destroys the task. It will reap resources asynchronously
// if the task is currently executing. Use nni_task_wait() first if the
Expand All @@ -67,9 +68,9 @@ extern void nni_taskq_sys_fini(void);
// consuming structures.
struct nni_task {
nni_list_node task_node;
void * task_arg;
void *task_arg;
nni_cb task_cb;
nni_taskq * task_tq;
nni_taskq *task_tq;
unsigned task_busy;
bool task_prep;
nni_mtx task_mtx;
Expand Down
4 changes: 2 additions & 2 deletions src/sp/transport/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2023 Staysail Systems, Inc. <[email protected]>
# Copyright 2024 Staysail Systems, Inc. <[email protected]>
#
# This software is supplied under the terms of the MIT License, a
# copy of which should be located in the distribution where this
Expand All @@ -15,6 +15,6 @@ add_subdirectory(inproc)
add_subdirectory(ipc)
add_subdirectory(tcp)
add_subdirectory(tls)
add_subdirectory(udp)
add_subdirectory(ws)
add_subdirectory(zerotier)

Loading