Minor bug fix for shell scripts like `kill_tera.sh`, `launch_tera.sh` and teracli by lpstudy · Pull Request #1280 · baidu/tera

lpstudy · 2017-06-02T12:25:16Z

add readline download link to avoid compile error (build.conf.template and build.sh.
run the shell with CURRENT_DIRECTORY, to avoid the error like bin/kill_tera.sh.
add GetProcessDir function to get the exe directory, so that we can run teracli in any directory, rather than only work by ./teracli.

1. add readline download link to avoid compile error 2. run the shell with CURRENT_DIRECTORY, to avoid the error like `bin/kill_tera.sh` 3. add GetProcessDir function to get the exe directory, so that we can run `teracli` in any directory, rather than only work by `./teracli`.

(baidu#1279)

caijieming-ng · 2017-06-06T02:50:06Z

src/common/file/file_path.cc

+    }
+	return buf;
+}
+


代码风格：缩进不对，左大括号缺少空格

caijieming-ng · 2017-06-06T02:50:16Z

src/common/file/file_path.cc

+    return dirname(buf);
+    }
+}



caijieming-ng · 2017-06-06T02:52:20Z

src/sdk/client_impl.cc

    }
-
+    std::string exedir = GetProcessDir();
    if (!confpath.empty() && IsExist(confpath)){


tera.flag里面会配置logdir，路径不对的话，会导致日志不能输出，可以增加一下判断

增加了判断。

caijieming-ng · 2017-06-06T02:52:54Z

src/sdk/client_impl.cc

        return -1;
-    }
+        }



代码风格

caijieming-ng · 2017-06-06T02:56:34Z

build.sh

+    cd -
+    touch "${FLAG_DIR}/readline_${READLINE_VERSION}"
+fi
+


如果系统已经预装了readline，就不需要下载此tar包重新编译了

已经增加了判断，我的是centos7.2的系统，但是并没有安装readline库。需要手动安装，其他预装库都正常，我认为其他人也会有相似的情况。

caijieming-ng · 2017-06-06T03:20:09Z

build.conf.template

    INS_URL=http://gitlab.baidu.com/baidups/third/raw/master/ins-${INS_VERSION}.tar.gz
    NOSE_URL=http://gitlab.baidu.com/baidups/third/raw/master/nose-${NOSE_VERSION}.tar.gz
+    READLINE_URL=http://git.savannah.gnu.org/cgit/readline.git/snapshot/readline-${READLINE_VERSION}.tar.gz
 else


百度内部编译方式不需要使用此包

caijieming-ng · 2017-06-06T03:24:14Z

src/common/file/file_path.cc

 #include <sys/types.h>
 #include <unistd.h>
+#include <libgen.h>



google的代码风格

感谢评论，原来我并没有关注过头文件的包含顺序问题，去调查了一下顺序：OS SDK .h , C标准库、C++标准库、其它库的头文件、自己工程的头文件。于是按照这个顺序重新组织了一下，如下：

#include "common/file/file_path.h"

#include <dirent.h>
#include <grp.h>
#include <libgen.h>
#include <pwd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>

#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include <gflags/gflags.h>

#include "common/base/string_ext.h"

caijieming-ng · 2017-06-06T03:31:57Z

src/common/file/file_path.cc

+        return "";
+    } else{
+    return dirname(buf);
+    }


dirname返回一个char*，是否需要释放；如果不用释放，是否是线程安全的？

不需要释放，线程安全的。dirname可能返回内部的static alloc的内存，也可能返回buf的内存。buf本身是局部变量，可以确保线程安全，dirname本身是线程安全函数。

如果是内部的静态分配，为什么是线程安全的

caijieming-ng · 2017-06-06T04:16:43Z

src/common/file/file_path.cc

+
+std::string GetProcessDir(){
+    char buf[1024];
+    ssize_t count = readlink("/proc/self/exe", buf, 1024);


路径长度最大是1024吗

已设置为linux/limits.h中的PATH_MAX常量

see the comments for the details.

caijieming-ng · 2017-06-16T14:31:11Z

src/sdk/client_impl.cc

+        LOG(ERROR) << "wrong log directory: "<<FLAGS_log_dir;
+        return -1;
+    }
+


可以报warning，不应该直接new client失败；

lpstudy added 2 commits June 2, 2017 20:18

Minor bug fix for not passing the Travis CI build.

2f6a8c0

(baidu#1279)

caijieming-ng reviewed Jun 6, 2017

View reviewed changes

(baidu#1279)

c2bd8a4

see the comments for the details.

caijieming-ng reviewed Jun 16, 2017

View reviewed changes

Conversation

lpstudy commented Jun 2, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants