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.

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

Sync with upstream & fix confilcts #800

Merged
merged 34 commits into from Jan 10, 2024
Merged

Sync with upstream & fix confilcts #800

merged 34 commits into from Jan 10, 2024

Conversation

JaylinYu
Copy link
Member

@JaylinYu JaylinYu commented Jan 9, 2024

No description provided.

dependabot bot and others added 29 commits January 9, 2024 11:59
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.14.0 to 0.17.0.
- [Commits](golang/crypto@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…onnections

* Fix conflicts

This transport only listens, and creates connections when
the application calls setopt on the lister with NNG_OPT_SOCKET_FD,
to pass a file descriptor.  The FD is turned into an nng_stream,
and utilized for SP.  The protocol over the descriptor is identical
to the TCP protocol (not the IPC protocol).

The options for peer information are borrowed from the IPC transport,
as they may be useful for these purposes.

This includes a test suite and full documentation.

Signed-off-by: jaylin <jaylin@emqx.io>
Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.9.0 to 5.11.0.
- [Release notes](https://github.com/go-git/go-git/releases)
- [Commits](go-git/go-git@v5.9.0...v5.11.0)

---
updated-dependencies:
- dependency-name: github.com/go-git/go-git/v5
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
This eliminates some code.  A test is added as well, so this should
help with coverage.
This code was not well tested, and is racy as well.
Again, this was racy code, and not well tested.  Set this option
before starting the endpoint if you need to be sure.
Fix conflicts - more errors pops out

This includes a manual page documenting the entire set of
functions in one step.  The hash is 64-bit based for now, to
be maximally flexible.  An internal 32-bit convenience for the
common internal use is also provided (not public).

The public API includes a test suite.

Signed-off-by: jaylin <jaylin@emqx.io>
This (defaults to 8) sets a limit on the number of poller threads
that will be used for servicing I/Os.  This is the size of the
I/O completion port thread pool on Windows.  POSIX pollers are generally
not concurrent at present.
While here fixed a number of nits in comments.
fix conflicts

This further limits some of the thread counts, but principally it
offers a new runtime facility, nng_init_set_parameter(), which can
be used to set certain runtime parameters on the number of threads,
provided it is called before the rest of application start up.

This facility is quite intentionally "undocumented", at least for now,
as we want to limit our commitment to it.  Still this should be helpful
for applications that need to reduce the number of threads that are
created.

Signed-off-by: jaylin <jaylin@emqx.io>
fix conflicts

We accidentally made idhash not public by not publishing its header
in the right place.  This is really generic utility stuff, so we
have posted it in the nng/supplemental/util/ directory.

We've also removed the ability to remove this -- its a very small amount
of additional code, as its just a wrapper on top of mandatory functionality.

Signed-off-by: jaylin <jaylin@emqx.io>
Signed-off-by: jaylin <jaylin@emqx.io>
@JaylinYu
Copy link
Member Author

JaylinYu commented Jan 9, 2024

all ci failed I am working on it

Copy link
Member

@wanghaEMQ wanghaEMQ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Such a huge pr

Signed-off-by: jaylin <jaylin@emqx.io>
Signed-off-by: jaylin <jaylin@emqx.io>
Signed-off-by: jaylin <jaylin@emqx.io>
@JaylinYu
Copy link
Member Author

public broker is down

Copy link

codecov bot commented Jan 10, 2024

Codecov Report

Attention: 195 lines in your changes are missing coverage. Please review.

Comparison is base (9d5f4b8) 63.24% compared to head (1cf843c) 63.63%.
Report is 12 commits behind head on main.

Files Patch % Lines
src/sp/transport/socket/sockfd.c 77.75% 103 Missing ⚠️
src/platform/posix/posix_sockfd.c 73.33% 56 Missing ⚠️
src/core/sockfd.c 72.72% 21 Missing ⚠️
src/supplemental/util/idhash.c 77.27% 5 Missing ⚠️
src/core/init.c 87.87% 4 Missing ⚠️
src/core/idhash.c 90.90% 1 Missing ⚠️
src/core/socket.c 66.66% 1 Missing ⚠️
src/platform/posix/posix_peerid.c 0.00% 1 Missing ⚠️
src/platform/posix/posix_resolv_gai.c 92.30% 1 Missing ⚠️
src/platform/posix/posix_socketpair.c 0.00% 1 Missing ⚠️
... and 1 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #800      +/-   ##
==========================================
+ Coverage   63.24%   63.63%   +0.38%     
==========================================
  Files         123      129       +6     
  Lines       36165    36965     +800     
==========================================
+ Hits        22874    23524     +650     
- Misses      13291    13441     +150     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: jaylin <jaylin@emqx.io>
@JaylinYu JaylinYu merged commit e14fe8a into main Jan 10, 2024
15 of 16 checks passed
@JaylinYu JaylinYu deleted the jaylin/develop branch January 10, 2024 03:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants