Fix #5134 segmentfault #5138
Merged
Fix #5134 segmentfault #5138
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #5138 +/- ##
==========================================
+ Coverage 72.93% 72.99% +0.06%
==========================================
Files 69 69
Lines 14848 14852 +4
==========================================
+ Hits 10829 10841 +12
+ Misses 4019 4011 -8
... and 3 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
dongzitai
reviewed
Aug 27, 2023
include/swoole_server.h
Outdated
| @@ -1318,6 +1318,7 @@ class Server { | |||
| } | |||
|
|
|||
| int create_pipe_buffers(); | |||
| void free_pipe_buffers(); | |||
There was a problem hiding this comment.
下面已经有个release_pipe_buffers()的定义，没有必要再定义free_pipe_buffers了吧
There was a problem hiding this comment.
原来还有release_pipe_buffers这个定义，但是这个没有实现，待会把free_pipe_buffers直接改名成release_pipe_buffers好了
src/server/manager.cc
Outdated
| @@ -187,6 +187,7 @@ void Manager::wait(Server *_server) { | |||
| delete[] pool->reload_workers; | |||
| pool->reload_workers = nullptr; | |||
| server_->manager = nullptr; | |||
| server_->free_pipe_buffers(); | |||
There was a problem hiding this comment.
free_pipe_buffers();放在Server::destroy()里面比较好，SWOOLE_BASE模式下，worker_num=1这里不会得到执行
src/server/master.cc
Outdated
| @@ -753,6 +753,7 @@ Server::~Server() { | |||
| delete port; | |||
| } | |||
| sw_shm_free(gs); | |||
| free_pipe_buffers(); | |||
There was a problem hiding this comment.
如果free_pipe_buffers();放在Server::destroy()里面，这里就没有必要了
dongzitai
approved these changes
Aug 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.