d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Annotate all changes made in r316178-r316180 with __FreeBSD__

Browse Source 
Restore the stock (upstream) code under an #else block, so it's easier
for me to visualize and understand the code that needs to be upstreamed.

MFC after:	2 months
X-MFC with:	r316178, r316179, r316180
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-03-30 07:13:47 +00:00
parent 836c0dc9e5
commit 9532aae589
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=316260
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/netbsd-tests/lib/libc/sys/t_msgctl.c
View File

@ -203,7 +203,11 @@ ATF_TC_BODY(msgctl_pid, tc)
if (pid == 0) {
#ifdef __FreeBSD__
(void)msgsnd(id, &msg, sizeof(msg.buf), IPC_NOWAIT);
#else
(void)msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT);
#endif
_exit(EXIT_SUCCESS);
}
@ -314,7 +318,11 @@ ATF_TC_BODY(msgctl_time, tc)
t = time(NULL);
(void)memset(&msgds, 0, sizeof(struct msqid_ds));
#ifdef __FreeBSD__
(void)msgsnd(id, &msg, sizeof(msg.buf), IPC_NOWAIT);
#else
(void)msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT);
#endif
(void)msgctl(id, IPC_STAT, &msgds);
if (llabs(t - msgds.msg_stime) > 1)

28
contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c
View File

@ -98,7 +98,11 @@ ATF_TC_BODY(msgsnd_block, tc)
*/
for (;;) {
#ifdef __FreeBSD__
if (msgsnd(id, &msg, sizeof(msg.buf), 0) < 0)
#else
if (msgsnd(id, &msg, sizeof(struct msg), 0) < 0)
#endif
_exit(EXIT_FAILURE);
}
}
@ -140,7 +144,11 @@ ATF_TC_BODY(msgsnd_count, tc)
for (;;) {
errno = 0;
#ifdef __FreeBSD__
rv = msgsnd(id, &msg, sizeof(msg.buf), IPC_NOWAIT);
#else
rv = msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT);
#endif
if (rv == 0) {
i++;
@ -184,12 +192,20 @@ ATF_TC_BODY(msgsnd_err, tc)
errno = 0;
ATF_REQUIRE_ERRNO(EFAULT, msgsnd(id, (void *)-1,
#ifdef __FreeBSD__
sizeof(msg.buf), IPC_NOWAIT) == -1);
#else
sizeof(struct msg), IPC_NOWAIT) == -1);
#endif
errno = 0;
ATF_REQUIRE_ERRNO(EINVAL, msgsnd(-1, &msg,
#ifdef __FreeBSD__
sizeof(msg.buf), IPC_NOWAIT) == -1);
#else
sizeof(struct msg), IPC_NOWAIT) == -1);
#endif
errno = 0;
@ -200,7 +216,11 @@ ATF_TC_BODY(msgsnd_err, tc)
msg.mtype = 0;
ATF_REQUIRE_ERRNO(EINVAL, msgsnd(id, &msg,
#ifdef __FreeBSD__
sizeof(msg.buf), IPC_NOWAIT) == -1);
#else
sizeof(struct msg), IPC_NOWAIT) == -1);
#endif
ATF_REQUIRE(msgctl(id, IPC_RMID, 0) == 0);
}
@ -234,7 +254,11 @@ ATF_TC_BODY(msgsnd_nonblock, tc)
for (;;) {
errno = 0;
#ifdef __FreeBSD__
rv = msgsnd(id, &msg, sizeof(msg.buf), IPC_NOWAIT);
#else
rv = msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT);
#endif
if (rv == -1 && errno == EAGAIN)
_exit(EXIT_SUCCESS);
@ -299,7 +323,11 @@ ATF_TC_BODY(msgsnd_perm, tc)
errno = 0;
#ifdef __FreeBSD__
if (msgsnd(id, &msg, sizeof(msg.buf), IPC_NOWAIT) == 0)
#else
if (msgsnd(id, &msg, sizeof(struct msg), IPC_NOWAIT) == 0)
#endif
_exit(EXIT_FAILURE);
if (errno != EACCES)