Page MenuHomeFreeBSD
Differential D22814

Make linux(4) use kern_socketpair(9)
ClosedPublic
Actions

Authored by trasz on Dec 14 2019, 1:03 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 17, 7:28 AM
Unknown Object (File)
Wed, Apr 16, 12:55 AM
Unknown Object (File)
Mon, Apr 14, 12:49 AM
Unknown Object (File)
Feb 28 2025, 1:18 AM
Unknown Object (File)
Feb 24 2025, 1:51 AM
Unknown Object (File)
Feb 23 2025, 4:37 AM
Unknown Object (File)
Feb 21 2025, 8:19 AM
Unknown Object (File)
Feb 17 2025, 5:28 AM
View All 48 Files
Subscribers
imp

Details

Reviewers
dchagin
emaste
kib
Group Reviewers
Linux Emulation
Commits
rS357727: Make linux(4) use kern_socketpair(9) instead of going through
Summary

Make linux(4) use kern_socketpair(9) instead of going through
sys_socketpair(). It's a cleanup; no functional changes.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 28152
Build 26287: arc lint + arc unit

Event Timeline

trasz created this revision.Dec 14 2019, 1:03 PM
Herald added a subscriber: imp. · View Herald TranscriptDec 14 2019, 1:03 PM
Harbormaster completed remote builds in B28152: Diff 65655.Dec 14 2019, 1:03 PM
trasz added reviewers: Linux Emulation, dchagin, emaste, kib.Dec 14 2019, 1:04 PM
kib added inline comments.Dec 14 2019, 4:41 PM
sys/compat/linux/linux_socket.c
758

Wrong indent.

770

else is not needed. Is this correct, in fact ?

776

Extra empty line.

782

Same.

trasz updated this revision to Diff 66737.Jan 14 2020, 12:34 PM

Fix things pointed out by kib@.

Harbormaster completed remote builds in B28662: Diff 66737.Jan 14 2020, 12:34 PM
trasz marked 4 inline comments as done.Jan 14 2020, 12:35 PM
kib accepted this revision.Jan 14 2020, 7:45 PM
kib added inline comments.
sys/compat/linux/linux_socket.c
766

Does this sentence in comment still makes sense ?

While there, remove the blank line before the comment.

775

sizeof(sv) is better IMO.

This revision is now accepted and ready to land.Jan 14 2020, 7:45 PM
Closed by commit rS357727: Make linux(4) use kern_socketpair(9) instead of going through (authored by trasz). · Explain WhyFeb 10 2020, 1:24 PM
This revision was automatically updated to reflect the committed changes.
trasz added a commit: rS357727: Make linux(4) use kern_socketpair(9) instead of going through.

Revision Contents
Changeset List

PathSize
sys/
compat/
linux/
34 lines

Diff 65655

View Options

sys/compat/linux/linux_socket.c

Show First 20 Lines • Show All 112 Lines • ▼ Show 20 Lines
/* /*
* Read the specified part of a file to kernel space. Unlike regular * Read the specified part of a file to kernel space. Unlike regular
* pread, the file pointer is advanced to the end of the read data, * pread, the file pointer is advanced to the end of the read data,
* and it just returns 0 if successful. * and it just returns 0 if successful.
*/ */
int int
kern_pread(int fd, vm_offset_t dest, size_t len, off_t off) kern_pread(int fd, vm_offset_t dest, size_t len, off_t off)
{ {
ssize_t nread;
if (lseek(fd, off, SEEK_SET) == -1) { if (lseek(fd, off, SEEK_SET) == -1) {
#ifdef DEBUG #ifdef DEBUG
printf("\nlseek failed\n"); printf("\nlseek failed\n");
#endif #endif
return (-1); return (-1);
} }
nread = archsw.arch_readin(fd, dest, len); if ((size_t)archsw.arch_readin(fd, dest, len) != len) {
if (nread != len) {
#ifdef DEBUG #ifdef DEBUG
printf("\nreadin failed\n"); printf("\nreadin failed\n");
#endif #endif
return (-1); return (-1);
} }
return (0); return (0);
} }
/* /*
* Read the specified part of a file to a malloced buffer. The file * Read the specified part of a file to a malloced buffer. The file
* pointer is advanced to the end of the read data. * pointer is advanced to the end of the read data.
*/ */
void * void *
alloc_pread(int fd, off_t off, size_t len) alloc_pread(int fd, off_t off, size_t len)
{ {
void *buf; void *buf;
ssize_t nread;
buf = malloc(len); buf = malloc(len);
if (buf == NULL) { if (buf == NULL) {
#ifdef DEBUG #ifdef DEBUG
printf("\nmalloc(%d) failed\n", (int)len); printf("\nmalloc(%d) failed\n", (int)len);
#endif #endif
return (NULL); return (NULL);
} }
if (lseek(fd, off, SEEK_SET) == -1) { if (lseek(fd, off, SEEK_SET) == -1) {
#ifdef DEBUG #ifdef DEBUG
printf("\nlseek failed\n"); printf("\nlseek failed\n");
#endif #endif
free(buf); free(buf);
return (NULL); return (NULL);
} }
nread = read(fd, buf, len); if ((size_t)read(fd, buf, len) != len) {
if (nread != len) {
#ifdef DEBUG #ifdef DEBUG
printf("\nread failed\n"); printf("\nread failed\n");
#endif #endif
free(buf); free(buf);
return (NULL); return (NULL);
} }
return (buf); return (buf);
} }
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines