Page MenuHomeFreeBSD
Differential D46303

socket: Split up soreceive_stream()
ClosedPublic
Actions

Authored by markj on Aug 15 2024, 2:08 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 3, 4:28 AM
Unknown Object (File)
Mar 1 2025, 9:28 AM
Unknown Object (File)
Feb 22 2025, 2:21 PM
Unknown Object (File)
Feb 22 2025, 1:45 PM
Unknown Object (File)
Feb 22 2025, 1:37 PM
Unknown Object (File)
Feb 9 2025, 8:19 AM
Unknown Object (File)
Jan 16 2025, 5:41 PM
Unknown Object (File)
Jan 16 2025, 4:49 PM
View All 56 Files
Subscribers
imp
olce

Details

Reviewers
glebius
gallatin
Commits
rG20bef7f7c2e2: socket: Split up soreceive_stream()
rGaa141adc039a: socket: Split up soreceive_stream()
Summary

Factor out the bits that run with the sock I/O lock held into a separate
function. No functional change intended.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 59028
Build 55915: arc lint + arc unit

Revision Contents
Changeset List

PathSize
sys/
kern/
109 lines

Diff 142105

View Options

sys/kern/uipc_socket.c

Show First 20 Lines • Show All 4,327 Lines • ▼ Show 20 Lines for dir in $$(${ALL-DEPENDS-LIST}); do \
_p=$$(cd $$dir; ${MAKE} -VPKGNAME); \ _p=$$(cd $$dir; ${MAKE} -VPKGNAME); \
if ! $$(${ECHO_CMD} $${_packages} | ${GREP} -q $${_p}); then \ if ! $$(${ECHO_CMD} $${_packages} | ${GREP} -q $${_p}); then \
${ECHO_CMD} $${_p}; \ ${ECHO_CMD} $${_p}; \
fi; \ fi; \
done done
# Install missing dependencies from package # Install missing dependencies from package
install-missing-packages: install-missing-packages:
@_dirs=$$(${MISSING-DEPENDS-LIST}); \ @_dirs=$$(${MISSING-DEPENDS-LIST}); \
if [ -n "$${_dirs}" ]; then \ ${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
matUnsubmitted
Done
Inline Actions

I would use | ${XARGS} which will take care of that.

mat: I would use `| ${XARGS}` which will take care of that.
0mpAuthorUnsubmitted
Done
Inline Actions

Hmm, sure, although I think that tr is more explicit.

0mp: Hmm, sure, although I think that tr is more explicit.
tobikUnsubmitted
Done
Inline Actions

This should be

${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" | ${SED} 's%${PORTSDIR}/%%g' | ${XARGS} ${PKG_BIN} install -A"

or even better push the su outwards as much as possible

${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} ${PKG_BIN} install -A"

tobik: This should be `${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" | ${SED} 's%${PORTSDIR}/%%g' | ${XARGS}…
0mpAuthorUnsubmitted
Done
Inline Actions

We've tried that approach, @tobik.

The problem is that then you cannot have interactive prompts from pkg (stdin is taken by xargs).

0mp: We've tried that approach, @tobik. The problem is that then you cannot have interactive…
tobikUnsubmitted
Done
Inline Actions

I see. Luckily there seems to be an xargs(1) flag for exactly that, -o:

${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
tobik: I see. Luckily there seems to be an xargs(1) flag for exactly that, `-o`: ``` ${ECHO_CMD}…
0mpAuthorUnsubmitted
Done
Inline Actions

Ha! I didn't know about this one! Thanks.

0mp: Ha! I didn't know about this one! Thanks.
${SU_CMD} "${PKG_BIN} install -A $$(${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g")"; \
fi
################################################################ ################################################################
# Everything after here are internal targets and really # Everything after here are internal targets and really
# shouldn't be touched by anybody but the release engineers. # shouldn't be touched by anybody but the release engineers.
################################################################ ################################################################
# This target generates an index entry suitable for aggregation into # This target generates an index entry suitable for aggregation into
# a large index. Format is: # a large index. Format is:
▲ Show 20 Lines • Show All 1,058 Lines • Show Last 20 Lines