[WIP] try to support both replxx and linenoise

Author: Willaaaaaaa

CMakeLists.txt

@@ -158,7 +158,7 @@ IF (EXISTS /usr/local/lib64)
     LINK_DIRECTORIES (/usr/local/lib64)
 ENDIF ()
 
-INCLUDE_DIRECTORIES(. ${PROJECT_SOURCE_DIR}/deps ${PROJECT_SOURCE_DIR}/src /usr/local/include)
+INCLUDE_DIRECTORIES(. ${PROJECT_SOURCE_DIR}/deps ${PROJECT_SOURCE_DIR}/deps/3rd/usr/local/include ${PROJECT_SOURCE_DIR}/src /usr/local/include)
 
 IF(WITH_UNIT_TESTS)
     IF (ENABLE_COVERAGE)

src/common/CMakeLists.txt

@@ -19,6 +19,11 @@ IF(USE_MUSL_LIBC)
     TARGET_LINK_LIBRARIES(common execinfo)
 ENDIF(USE_MUSL_LIBC)
 
+IF(USE_REPLXX)
+    TARGET_LINK_LIBRARIES(common replxx::replxx)
+    MESSAGE(STATUS "common uses replxx")
+ENDIF()
+
 # 编译静态库时，自动会把同名的动态库给删除， 因此需要临时设置一下
 SET_TARGET_PROPERTIES(common PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 

src/common/linereader/line_reader.cpp

@@ -13,6 +13,7 @@ See the Mulan PSL v2 for more details. */
 //
 
 #include "common/linereader/line_reader.h"
+#include "common/lang/string.h"
 
 namespace common {
 LineReader LineReaderManager::reader_;
@@ -24,7 +25,7 @@ char* LineReaderManager::my_readline(const char* prompt, const std::string& hist
     is_first_call_ = false;
   }
 
-  char* line = reader_.input(prompt);
+  char* line = (char*)reader_.input(prompt);
   if (line == nullptr) {
     return nullptr;
   }
@@ -56,4 +57,14 @@ bool LineReaderManager::is_exit_command(const char* cmd, const std::string& hist
 
   return is_exit;
 }
+
+void LineReaderManager::free_buffer(char* buffer) {
+  if (buffer != nullptr) {
+#if USE_REPLXX
+    delete[] buffer;  // replxx uses new[]
+#else
+    free(buffer);     // linenoise uses malloc
+#endif
+  }
+}
 } // namespace common

src/common/linereader/line_reader.h

@@ -42,6 +42,13 @@ class LineReaderManager {
    */
   static bool is_exit_command(const char* cmd, const std::string& history_file);
 
+  /**
+   * @brief Free the buffer allocated by my_readline
+   * @param buffer The buffer allocated by my_readline
+   * @note dealing with alloc-dealloc-mismatch
+   */
+  static void free_buffer(char* buffer);
+
 private:
   static LineReader reader_;
   static bool is_first_call_;

src/common/linereader/linenoise_reader.h

@@ -27,9 +27,10 @@ class LinenoiseReader {
   ~LinenoiseReader() = default;
 
   /**
-   * @brief Read input with C string
+   * @brief Read input with C++ string
    * @param prompt
    * @return char* to input string or nullptr
+  //  * @note set prompt to string to be consistent with replxx
    */
   char* input(const char* prompt);
 

src/obclient/client.cpp

@@ -145,13 +145,13 @@ int main(int argc, char *argv[])
 
   while ((input_command = LineReaderManager::my_readline(prompt_str, LINE_HISTORY_FILE)) != nullptr) {
     if (common::is_blank(input_command)) {
-      free(input_command);
+      LineReaderManager::free_buffer(input_command);
       input_command = nullptr;
       continue;
     }
 
     if (is_exit_command(input_command)) {
-      free(input_command);
+      LineReaderManager::free_buffer(input_command);
       input_command = nullptr;
       break;
     }
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
       fprintf(stderr, "send error: %d:%s \n", errno, strerror(errno));
       exit(1);
     }
-    free(input_command);
+    LineReaderManager::free_buffer(input_command);
     input_command = nullptr;
 
     memset(send_buf, 0, sizeof(send_buf));
@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
   }
 
   if (input_command != nullptr) {
-    free(input_command);
+    LineReaderManager::free_buffer(input_command);
     input_command = nullptr;
   }
   close(sockfd);

src/oblsm/client/ob_lsm_client.cpp

@@ -127,7 +127,7 @@ int main(int, char **)
     }
 
     std::string command = command_input;
-    free(command_input);
+    LineReaderManager::free_buffer(command_input);
     command_input = nullptr;
 
     if (!command.empty()) {

src/observer/net/cli_communicator.cpp

@@ -66,19 +66,19 @@ RC CliCommunicator::read_event(SessionEvent *&event)
   }
 
   if (common::is_blank(command)) {
-    free(command);
+    LineReaderManager::free_buffer(command);
     return RC::SUCCESS;
   }
 
   if (LineReaderManager::is_exit_command(command, LINE_HISTORY_FILE)) {
-    free(command);
+    LineReaderManager::free_buffer(command);
     exit_ = true;
     return RC::SUCCESS;
   }
 
   event = new SessionEvent(this);
   event->set_query(string(command));
-  free(command);
+  LineReaderManager::free_buffer(command);
   return RC::SUCCESS;
 }