[GitHub] [incubator-brpc-website] tanzhongyibidu opened a new pull request #17: fix a url error
tanzhongyibidu opened a new pull request #17: fix a url error URL: https://github.com/apache/incubator-brpc-website/pull/17 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org For additional commands, e-mail: dev-h...@brpc.apache.org
[GitHub] [incubator-brpc-website] tanzhongyibidu merged pull request #17: fix a url error
tanzhongyibidu merged pull request #17: fix a url error URL: https://github.com/apache/incubator-brpc-website/pull/17 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org For additional commands, e-mail: dev-h...@brpc.apache.org
[GitHub] [incubator-brpc] jamesge commented on issue #956: 建议线程退出时，把LocalPool中未使用item的id也加入到全局空闲队列
jamesge commented on issue #956: 建议线程退出时，把LocalPool中未使用item的id也加入到全局空闲队列 URL: https://github.com/apache/incubator-brpc/issues/956#issuecomment-549220251 确实是可以的，不过目前brpc的场景中几乎不会退出pthread（才会导致LocalPool析构），这个修改很难验证实际效果。 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org For additional commands, e-mail: dev-h...@brpc.apache.org
[GitHub] [incubator-brpc] jamesge commented on issue #955: BoundedQueue的pop_bottom()有内存越界的问题
jamesge commented on issue #955: BoundedQueue的pop_bottom()有内存越界的问题 URL: https://github.com/apache/incubator-brpc/issues/955#issuecomment-549219289 感谢报告问题，已修复 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org For additional commands, e-mail: dev-h...@brpc.apache.org
[incubator-brpc] branch master updated: Fix #955 and add UT
This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new 11949fc Fix #955 and add UT
11949fc is described below
commit 11949fc1cb60a96f891205853162e8f7b0f1ff87
Author: jamesge
AuthorDate: Sun Nov 3 20:02:17 2019 -0800
Fix #955 and add UT
---
src/butil/containers/bounded_queue.h | 12 ++--
test/BUILD | 1 +
test/CMakeLists.txt | 1 +
test/Makefile| 1 +
test/bounded_queue_unittest.cc | 106 +++
5 files changed, 116 insertions(+), 5 deletions(-)
diff --git a/src/butil/containers/bounded_queue.h
b/src/butil/containers/bounded_queue.h
index 556d70b..fb688ca 100644
--- a/src/butil/containers/bounded_queue.h
+++ b/src/butil/containers/bounded_queue.h
@@ -168,8 +168,9 @@ public:
bool pop(T* item) {
if (_count) {
--_count;
-*item = ((T*)_items)[_start];
-((T*)_items)[_start].~T();
+T* const p = (T*)_items + _start;
+*item = *p;
+p->~T();
_start = _mod(_start + 1, _cap);
return true;
}
@@ -181,7 +182,7 @@ public:
bool pop_bottom() {
if (_count) {
--_count;
-((T*)_items + _start + _count)->~T();
+((T*)_items + _mod(_start + _count, _cap))->~T();
return true;
}
return false;
@@ -192,8 +193,9 @@ public:
bool pop_bottom(T* item) {
if (_count) {
--_count;
-*item = ((T*)_items)[_start + _count];
-((T*)_items)[_start + _count].~T();
+T* const p = (T*)_items + _mod(_start + _count, _cap);
+*item = *p;
+p->~T();
return true;
}
return false;
diff --git a/test/BUILD b/test/BUILD
index 88ccafe..71206da 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -155,6 +155,7 @@ TEST_BUTIL_SOURCES = [
"scoped_locale.cc",
"recordio_unittest.cpp",
#"popen_unittest.cpp",
+"bounded_queue_unittest.cc",
"butil_unittest_main.cpp",
] + select({
"@bazel_tools//tools/osx:darwin": [],
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f61b715..f3642de 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -76,6 +76,7 @@ file(COPY ${PROJECT_SOURCE_DIR}/test/run_tests.sh DESTINATION
${CMAKE_CURRENT_BI
SET(TEST_BUTIL_SOURCES
${PROJECT_SOURCE_DIR}/test/recordio_unittest.cpp
${PROJECT_SOURCE_DIR}/test/popen_unittest.cpp
+${PROJECT_SOURCE_DIR}/test/bounded_queue_unittest.cc
${PROJECT_SOURCE_DIR}/test/at_exit_unittest.cc
${PROJECT_SOURCE_DIR}/test/atomicops_unittest.cc
${PROJECT_SOURCE_DIR}/test/base64_unittest.cc
diff --git a/test/Makefile b/test/Makefile
index 27c97c4..ad7fff1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -140,6 +140,7 @@ TEST_BUTIL_SOURCES = \
test_switches.cc \
scoped_locale.cc \
popen_unittest.cpp \
+bounded_queue_unittest.cc \
butil_unittest_main.cpp
ifeq ($(SYSTEM), Linux)
diff --git a/test/bounded_queue_unittest.cc b/test/bounded_queue_unittest.cc
new file mode 100644
index 000..6e1bc45
--- /dev/null
+++ b/test/bounded_queue_unittest.cc
@@ -0,0 +1,106 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+// Author: Ge,Jun (ge...@baidu.com)
+// Date: Sun Nov 3 19:16:50 PST 2019
+
+#include
+#include "butil/containers/bounded_queue.h"
+#include
+
+namespace {
+
+TEST(BoundedQueueTest, sanity) {
+const int N = 36;
+char storage[N * sizeof(int)];
+butil::BoundedQueue q(storage, sizeof(storage),
butil::NOT_OWN_STORAGE);
+ASSERT_EQ(0ul, q.size());
+ASSERT_TRUE(q.empty());
+ASSERT_TRUE(NULL == q.top());
+ASSERT_TRUE(NULL == q.bottom());
+for (int i = 1; i <= N; ++i) {
+if (i % 2 == 0) {
+ASSERT_TRUE(q.push(i));
+} else {
+int* p = q.push();
+ASSERT_TRUE(p);
+*p = i;
+}
+ASSERT_EQ((size_t)i, q.size());
+ASSERT_EQ(1,
[GitHub] [incubator-brpc] jamesge closed issue #955: BoundedQueue的pop_bottom()有内存越界的问题
jamesge closed issue #955: BoundedQueue的pop_bottom()有内存越界的问题 URL: https://github.com/apache/incubator-brpc/issues/955 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org For additional commands, e-mail: dev-h...@brpc.apache.org
[GitHub] [incubator-brpc] jamesge commented on issue #957: rpc_dump_dir
jamesge commented on issue #957: rpc_dump_dir URL: https://github.com/apache/incubator-brpc/issues/957#issuecomment-549212599 如何复现？ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org For additional commands, e-mail: dev-h...@brpc.apache.org
[GitHub] [incubator-brpc] tesla1995 opened a new issue #956: 建议线程退出时，把LocalPool中未使用item的id也加入到全局空闲队列
tesla1995 opened a new issue #956: 建议线程退出时，把LocalPool中未使用item的id也加入到全局空闲队列 URL: https://github.com/apache/incubator-brpc/issues/956 **Is your feature request related to a problem? (你需要的功能是否与某个问题有关?)** 在文件 `src/butil/resource_pool_inl.h` 中，线程退出时，析构LocalPool对象，在LocalPool的析构函数，只将_cur_free的item的id加入到全局空闲队列，是不是考虑把_cur_block中未使用的item的id也加入到全局队列，以减少内存浪费呢？  **Describe the solution you'd like (描述你期望的解决方法)** 析构LocalPool对象时，判断_cur_block->nitem是否小于BLOCK_NITEM。如果是，说明_cur_block中有未使用的item，把这部分item的id也要加入到全局的_free_chunks中。 **Describe alternatives you've considered (描述你想到的折衷方案)** **Additional context/screenshots (更多上下文/截图)** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org For additional commands, e-mail: dev-h...@brpc.apache.org
[GitHub] [incubator-brpc] tesla1995 opened a new issue #955: BoundedQueue的pop_bottom()有内存越界的问题
tesla1995 opened a new issue #955: BoundedQueue的pop_bottom()有内存越界的问题
URL: https://github.com/apache/incubator-brpc/issues/955
**Describe the bug (描述bug)**
brpc没有使用BoundedQueue的pop_bottom函数，但该函数实现存在内存越界的问题，如下图所示：
**To Reproduce (复现方法)**
测试代码为：
#include
#include
#include "butil/containers/bounded_queue.h"
using namespace std;
int main(void)
{
char storage[4 * sizeof(int)];
butil::BoundedQueue q(storage, sizeof(storage),
butil::NOT_OWN_STORAGE);
// 1, 2, 3, 4
assert(q.push(1) == true);
assert(q.push(2) == true);
assert(q.push(3) == true);
assert(q.push(4) == true);
// x, x, x, 4
assert(q.pop() == true);
assert(q.pop() == true);
assert(q.pop() == true);
// 1, 2, 3, 4
assert(q.push(1) == true);
assert(q.push(2) == true);
assert(q.push(3) == true);
cout << "bottom=" << *q.bottom() << endl; // 3
int tmp = -1;
q.pop_bottom();
cout << "tmp=" << tmp << endl; // 乱码
return 0;
}
编译命令：g++ -o bounded_queue_test bounded_queue_test.cc -lbrpc
运行结果：
./bounded_queue_test
bottom=3
tmp=-740301056
**Expected behavior (期望行为)**
**Versions (各种版本)**
OS:
Compiler:
brpc:
protobuf:
**Additional context/screenshots (更多上下文/截图)**
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org
For additional commands, e-mail: dev-h...@brpc.apache.org
