From 7b37d8fef7e47d0da8947f8a2995b96ec14e2e70 Mon Sep 17 00:00:00 2001 From: antao Date: Wed, 19 Dec 2018 16:01:34 +0800 Subject: [PATCH] Update the submodule trantor --- README.md | 2 +- README.zh-CN.md | 2 +- trantor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 38e4824f..d957e0aa 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Drogon's main application platform is Linux. For debugging purposes, it also supports Mac OS. There is no plan to support Windows. Its main features are as follows: -* The network layer uses a NIO framework based on epoll (poll under MacOS) to provide high-concurrency, high-performance network IO; +* The network layer uses a NIO framework based on epoll (kqueue under MacOS) to provide high-concurrency, high-performance network IO; * Full asynchronous programming mode; * Support Http1.0/1.1 (server side and client side); * Based on template, a simple reflection mechanism is implemented to completely decouple the main program framework, controller and view. diff --git a/README.zh-CN.md b/README.zh-CN.md index e6a83b1c..774b12f0 100755 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -7,7 +7,7 @@ Drogon的主要应用平台是Linux，为了调试方便，也支持Mac OS，目前还没有支持Windows的计划。它的主要特点如下： -* 网络层使用基于epoll(MacOS下是poll)的NIO框架，提供高并发、高性能的网络IO。详细请见[性能测试](https://gitee.com/an-tao/drogon/wikis/性能测试)； +* 网络层使用基于epoll(MacOS下是kqueue)的NIO框架，提供高并发、高性能的网络IO。详细请见[性能测试](https://gitee.com/an-tao/drogon/wikis/性能测试)； * 全异步编程模式； * 支持Http1.0/1.1(server端和client端)； * 基于template实现了简单的反射机制，使主程序框架、控制器(controller)和视图(view)完全解耦； diff --git a/trantor b/trantor index 49c63116..32c174b8 160000 --- a/trantor +++ b/trantor @@ -1 +1 @@ -Subproject commit 49c6311642f38070d34dd1a4f0408f8f41a5ebfc +Subproject commit 32c174b8c502319870afe3bdef0a8e3ed8b185d8