Skip to content

Commit 2a22c08

Browse files
sporksmithsporksmith
authored
Merge branch 'main' into doc-blas
2 parents 1d90962 + 0a686c9 commit 2a22c08

28 files changed

Lines changed: 1412 additions & 438 deletions

‎src/main/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ set(shadow_srcs
8989
core/manager.c
9090
core/worker.c
9191

92-
host/descriptor/channel.c
9392
host/descriptor/descriptor.c
9493
host/status_listener.c
9594
host/descriptor/compat_socket.c

‎src/main/Cargo.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ path = "lib.rs"
99
crate-type = ["staticlib"]
1010

1111
[dependencies]
12-
anyhow = { version = "1.0.48", features = ["backtrace"] }
12+
anyhow = { version = "1.0.51", features = ["backtrace"] }
1313
atomic_refcell = "0.1"
1414
bitflags = "1.3"
1515
# custom version of the bytes crate required to make the 'try_unsplit' method public

‎src/main/bindings/c/bindings.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,16 @@ SysCallReturn rustsyscallhandler_fcntl64(SysCallHandler *sys, const SysCallArgs
636636

637637
SysCallReturn rustsyscallhandler_ioctl(SysCallHandler *sys, const SysCallArgs *args);
638638

639+
SysCallReturn rustsyscallhandler_sendto(SysCallHandler *sys, const SysCallArgs *args);
640+
641+
SysCallReturn rustsyscallhandler_recvfrom(SysCallHandler *sys, const SysCallArgs *args);
642+
643+
SysCallReturn rustsyscallhandler_getsockname(SysCallHandler *sys, const SysCallArgs *args);
644+
645+
SysCallReturn rustsyscallhandler_getpeername(SysCallHandler *sys, const SysCallArgs *args);
646+
647+
SysCallReturn rustsyscallhandler_socketpair(SysCallHandler *sys, const SysCallArgs *args);
648+
639649
SysCallReturn rustsyscallhandler_close(SysCallHandler *sys, const SysCallArgs *args);
640650

641651
SysCallReturn rustsyscallhandler_dup(SysCallHandler *sys, const SysCallArgs *args);

‎src/main/bindings/rust/wrapper.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "main/host/syscall/fcntl.h"
2121
#include "main/host/syscall/ioctl.h"
2222
#include "main/host/syscall/unistd.h"
23+
#include "main/host/syscall/socket.h"
2324
#include "main/host/syscall_condition.h"
2425
#include "main/host/syscall_types.h"
2526
#include "main/host/thread.h"

‎src/main/bindings/rust/wrapper.rs‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,6 +1810,88 @@ extern "C" {
18101810
args: *const SysCallArgs,
18111811
) -> SysCallReturn;
18121812
}
1813+
extern "C" {
1814+
pub fn syscallhandler_accept(
1815+
sys: *mut SysCallHandler,
1816+
args: *const SysCallArgs,
1817+
) -> SysCallReturn;
1818+
}
1819+
extern "C" {
1820+
pub fn syscallhandler_accept4(
1821+
sys: *mut SysCallHandler,
1822+
args: *const SysCallArgs,
1823+
) -> SysCallReturn;
1824+
}
1825+
extern "C" {
1826+
pub fn syscallhandler_bind(sys: *mut SysCallHandler, args: *const SysCallArgs)
1827+
-> SysCallReturn;
1828+
}
1829+
extern "C" {
1830+
pub fn syscallhandler_connect(
1831+
sys: *mut SysCallHandler,
1832+
args: *const SysCallArgs,
1833+
) -> SysCallReturn;
1834+
}
1835+
extern "C" {
1836+
pub fn syscallhandler_getpeername(
1837+
sys: *mut SysCallHandler,
1838+
args: *const SysCallArgs,
1839+
) -> SysCallReturn;
1840+
}
1841+
extern "C" {
1842+
pub fn syscallhandler_getsockname(
1843+
sys: *mut SysCallHandler,
1844+
args: *const SysCallArgs,
1845+
) -> SysCallReturn;
1846+
}
1847+
extern "C" {
1848+
pub fn syscallhandler_getsockopt(
1849+
sys: *mut SysCallHandler,
1850+
args: *const SysCallArgs,
1851+
) -> SysCallReturn;
1852+
}
1853+
extern "C" {
1854+
pub fn syscallhandler_listen(
1855+
sys: *mut SysCallHandler,
1856+
args: *const SysCallArgs,
1857+
) -> SysCallReturn;
1858+
}
1859+
extern "C" {
1860+
pub fn syscallhandler_recvfrom(
1861+
sys: *mut SysCallHandler,
1862+
args: *const SysCallArgs,
1863+
) -> SysCallReturn;
1864+
}
1865+
extern "C" {
1866+
pub fn syscallhandler_sendto(
1867+
sys: *mut SysCallHandler,
1868+
args: *const SysCallArgs,
1869+
) -> SysCallReturn;
1870+
}
1871+
extern "C" {
1872+
pub fn syscallhandler_setsockopt(
1873+
sys: *mut SysCallHandler,
1874+
args: *const SysCallArgs,
1875+
) -> SysCallReturn;
1876+
}
1877+
extern "C" {
1878+
pub fn syscallhandler_shutdown(
1879+
sys: *mut SysCallHandler,
1880+
args: *const SysCallArgs,
1881+
) -> SysCallReturn;
1882+
}
1883+
extern "C" {
1884+
pub fn syscallhandler_socket(
1885+
sys: *mut SysCallHandler,
1886+
args: *const SysCallArgs,
1887+
) -> SysCallReturn;
1888+
}
1889+
extern "C" {
1890+
pub fn syscallhandler_socketpair(
1891+
sys: *mut SysCallHandler,
1892+
args: *const SysCallArgs,
1893+
) -> SysCallReturn;
1894+
}
18131895
pub use self::_TriggerType as TriggerType;
18141896
pub const _TriggerType_TRIGGER_NONE: _TriggerType = 0;
18151897
pub const _TriggerType_TRIGGER_DESCRIPTOR: _TriggerType = 1;

‎src/main/host/descriptor/channel.c‎

Lines changed: 0 additions & 227 deletions
This file was deleted.

0 commit comments

Comments
 (0)