From 16adcc259e695eb8372856cacc2a7acbafc975ff Mon Sep 17 00:00:00 2001 From: mapleFU <1506118561@qq.com> Date: Sun, 17 May 2020 02:23:27 +0800 Subject: [PATCH 1/4] [FIX] Fixing errors on memset Signed-off-by: mapleFU <1506118561@qq.com> --- log/log.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log/log.cpp b/log/log.cpp index c3098139..65e8ad46 100644 --- a/log/log.cpp +++ b/log/log.cpp @@ -35,7 +35,7 @@ bool Log::init(const char *file_name, int close_log, int log_buf_size, int split m_close_log = close_log; m_log_buf_size = log_buf_size; m_buf = new char[m_log_buf_size]; - memset(m_buf, '\0', sizeof(m_buf)); + memset(m_buf, '\0', m_log_buf_size); m_split_lines = split_lines; time_t t = time(NULL); From 7a9725ca67255325725f4d2d17d2d215ffa38885 Mon Sep 17 00:00:00 2001 From: qinguoyi <1532979219@qq.com> Date: Sun, 17 May 2020 10:37:39 +0800 Subject: [PATCH 2/4] beetle: fix io vector bug --- http/http_conn.cpp | 4 ++-- raw_version/http/http_conn.cpp | 2 +- raw_version/log/log.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/http/http_conn.cpp b/http/http_conn.cpp index 7c0143b3..6b80c425 100644 --- a/http/http_conn.cpp +++ b/http/http_conn.cpp @@ -731,7 +731,7 @@ bool http_conn::write() } else { - m_iv[0].iov_base = m_write_buf + bytes_to_send; + m_iv[0].iov_base = m_write_buf + bytes_have_send; m_iv[0].iov_len = m_iv[0].iov_len - bytes_have_send; } modfd(m_epollfd, m_sockfd, EPOLLOUT, m_TRIGMode); @@ -773,7 +773,7 @@ bool http_conn::add_response(const char *format, ...) } m_write_idx += len; va_end(arg_list); - + LOG_INFO("request:%s", m_write_buf); return true; diff --git a/raw_version/http/http_conn.cpp b/raw_version/http/http_conn.cpp index 7483d048..2ca7b232 100644 --- a/raw_version/http/http_conn.cpp +++ b/raw_version/http/http_conn.cpp @@ -755,7 +755,7 @@ bool http_conn::write() } else { - m_iv[0].iov_base = m_write_buf + bytes_to_send; + m_iv[0].iov_base = m_write_buf + bytes_have_send; m_iv[0].iov_len = m_iv[0].iov_len - bytes_have_send; } modfd(m_epollfd, m_sockfd, EPOLLOUT); diff --git a/raw_version/log/log.cpp b/raw_version/log/log.cpp index faea3f96..d9cefcea 100644 --- a/raw_version/log/log.cpp +++ b/raw_version/log/log.cpp @@ -34,7 +34,7 @@ bool Log::init(const char *file_name, int log_buf_size, int split_lines, int max m_log_buf_size = log_buf_size; m_buf = new char[m_log_buf_size]; - memset(m_buf, '\0', sizeof(m_buf)); + memset(m_buf, '\0', m_log_buf_size); m_split_lines = split_lines; time_t t = time(NULL); From a4aa1dc38c1728035ba9b5ad54a45ac990d457b3 Mon Sep 17 00:00:00 2001 From: qinguoyi <1532979219@qq.com> Date: Sun, 17 May 2020 11:46:49 +0800 Subject: [PATCH 3/4] :beetle: update && fix --- log/log.h | 3 +-- makefile | 16 +++------------- root/CGISQL.cgi | Bin 49936 -> 0 bytes 3 files changed, 4 insertions(+), 15 deletions(-) delete mode 100755 root/CGISQL.cgi diff --git a/log/log.h b/log/log.h index 6558c784..64972af4 100644 --- a/log/log.h +++ b/log/log.h @@ -22,7 +22,7 @@ class Log static void *flush_log_thread(void *args) { - return Log::get_instance()->async_write_log(); + Log::get_instance()->async_write_log(); } //可选择的参数有日志文件、日志缓冲区大小、最大行数以及最长日志条队列 bool init(const char *file_name, int close_log, int log_buf_size = 8192, int split_lines = 5000000, int max_queue_size = 0); @@ -44,7 +44,6 @@ class Log fputs(single_log.c_str(), m_fp); m_mutex.unlock(); } - return nullptr; } private: diff --git a/makefile b/makefile index e95df61c..a7c3fe79 100644 --- a/makefile +++ b/makefile @@ -1,18 +1,8 @@ -CXX ?= g++ -CXXFLAGS = -Wall -Werror -Wextra - -DEBUG ?= 1 -ifeq (DEBUG, 1) - CFLAGS += -g -Ddebug -else - CFLAGS += -O2 -endif - -server: main.cpp ./timer/lst_timer.cpp ./http/http_conn.cpp ./log/log.cpp ./CGImysql/sql_connection_pool.cpp webserver.cpp config.cpp - $(CXX) -lmysqlclient -lpthread $^ $(CXXFLAGS) -o server +server: main.cpp ./timer/lst_timer.cpp ./http/http_conn.cpp ./log/log.cpp ./CGImysql/sql_connection_pool.cpp webserver.cpp config.cpp + g++ -o server main.cpp ./timer/lst_timer.cpp ./http/http_conn.cpp ./log/log.cpp ./CGImysql/sql_connection_pool.cpp webserver.cpp config.cpp -lpthread -lmysqlclient CGISQL.cgi:./CGImysql/sign.cpp - $(CXX) -o ./root/CGISQL.cgi ./CGImysql/sign.cpp -lmysqlclient -lpthread + g++ -o ./root/CGISQL.cgi ./CGImysql/sign.cpp -lmysqlclient -lpthread clean: rm -r server diff --git a/root/CGISQL.cgi b/root/CGISQL.cgi deleted file mode 100755 index 0040829e6c6f95216c7da2b2117dd5dfd4bea978..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49936 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 Date: Sun, 17 May 2020 13:24:26 +0800 Subject: [PATCH 4/4] :memo: update makefile --- makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index a7c3fe79..e0b38c37 100644 --- a/makefile +++ b/makefile @@ -1,8 +1,17 @@ +CXX ?= g++ + +DEBUG ?= 1 +ifeq (DEBUG, 1) + CFLAGS = -g +else + CFLAGS = -O2 +endif + server: main.cpp ./timer/lst_timer.cpp ./http/http_conn.cpp ./log/log.cpp ./CGImysql/sql_connection_pool.cpp webserver.cpp config.cpp - g++ -o server main.cpp ./timer/lst_timer.cpp ./http/http_conn.cpp ./log/log.cpp ./CGImysql/sql_connection_pool.cpp webserver.cpp config.cpp -lpthread -lmysqlclient + $(CXX) -o server $^ $(CXXFLAGS) -lpthread -lmysqlclient CGISQL.cgi:./CGImysql/sign.cpp - g++ -o ./root/CGISQL.cgi ./CGImysql/sign.cpp -lmysqlclient -lpthread + g++ -o ./root/CGISQL.cgi $^ -lpthread -lmysqlclient clean: rm -r server