uftrace: Remove -L option for later usage

The -L/--library-path option is primarily used for testing purposes.
But the -L option has been removed to make it more useful for other purposes.
The --library-path is also replaced with more meaningful --libmcount-path.

Signed-off-by: Eunseon Lee <[email protected]>

doc/ko/uftrace-live.md

@@ -176,8 +176,8 @@ RECORD 옵션
 
 RECORD 설정 옵션
 =====================
--L *PATH*, \--library-path=*PATH*
-:   필요한 내부 라이브러리를 *PATH* 에서 먼저 찾는다.
+\--libmcount-path=*PATH*
+:   limcount 라이브러리를 *PATH* 에서 먼저 찾는다.
     이 옵션은 대부분 테스트 목적으로 사용된다.
 
 -b *SIZE*, \--buffer=*SIZE*

doc/ko/uftrace-record.md

@@ -169,8 +169,8 @@ RECORD 옵션
 
 RECORD 설정 옵션
 =====================
--L *PATH*, \--library-path=*PATH*
-:   필요한 내부 라이브러리를 *PATH* 에서 먼저 찾는다.
+\--libmcount-path=*PATH*
+:   libmcount 라이브러리를 *PATH* 에서 먼저 찾는다.
     이 옵션은 대부분 테스트 목적으로 사용된다.
 
 -b *SIZE*, \--buffer=*SIZE*

doc/uftrace-live.md

@@ -176,9 +176,8 @@ RECORD OPTIONS
 
 RECORD CONFIG OPTIONS
 =====================
--L *PATH*, \--library-path=*PATH*
-:   Load necessary internal libraries from this path.  This is mostly for
-    testing purposes.
+\--libmcount-path=*PATH*
+:   Load libmcount libraries from this path.  This is mostly for testing purposes.
 
 -b *SIZE*, \--buffer=*SIZE*
 :   Size of internal buffer in which trace data will be saved.  Default size is

doc/uftrace-record.md

@@ -174,9 +174,8 @@ COMMON OPTIONS
 
 RECORD CONFIG OPTIONS
 =====================
--L *PATH*, \--library-path=*PATH*
-:   Load necessary internal libraries from this path.  This is mostly for
-    testing purposes.
+\--libmcount-path=*PATH*
+:   Load libmcount libraries from this path.  This is mostly for testing purposes.
 
 -b *SIZE*, \--buffer=*SIZE*
 :   Size of internal buffer in which trace data will be saved.  Default size is

misc/bash-completion.sh

@@ -15,7 +15,7 @@ _uftrace () {
     uftrace_comp="${subcmds} ${options}"
 
     case $prev in
-	-d|--data|--diff|-L|--library-path)
+	-d|--data|--diff|-L|--libmcount-path)
 	    # complete directory name
 	    COMPREPLY=($(compgen -d -- "${cur}"))
 	    ;;

tests/arch/arm/Makefile

@@ -1,6 +1,6 @@
 CC = gcc
 RM = rm -f
-UFTRACE = ../../../uftrace -L ../../.. --flat
+UFTRACE = ../../../uftrace --libmcount-path=../../.. --flat
 
 #CFLAGS = -g -finstrument-functions
 CFLAGS = -g -pg -fno-omit-frame-pointer

tests/arch/x86_64/Makefile

@@ -1,6 +1,6 @@
 CC = gcc
 RM = rm -f
-UFTRACE = ../../../uftrace -L ../../.. --flat
+UFTRACE = ../../../uftrace --libmcount-path=../../.. --flat
 
 CFLAGS = -g -finstrument-functions
 

tests/runtest.py

@@ -29,7 +29,7 @@ class TestBase:
     basedir = os.path.dirname(os.getcwd())
     objdir = 'objdir' in os.environ and os.environ['objdir'] or basedir
     uftrace_cmd = objdir + '/uftrace'
-    default_opt = '--no-pager --no-event -L' + objdir
+    default_opt = '--no-pager --no-event --libmcount-path=' + objdir
 
     default_cflags = ['-fno-inline', '-fno-builtin', '-fno-ipa-cp',
                       '-fno-omit-frame-pointer', '-D_FORTIFY_SOURCE=0']

tests/t183_info_quote.py

@@ -11,7 +11,7 @@ def __init__(self):
 # ==================
 # program version     : uftrace v0.8.1-133-g7f71
 # recorded on         : Mon Nov 27 09:40:31 2017
-# cmdline             : ../uftrace record --no-pager --no-event -L.. t-hello \\"uftrace\\"
+# cmdline             : ../uftrace record --no-pager --no-event --libmcount-path=.. t-hello \\"uftrace\\"
 # cpu info            : Intel(R) Core(TM) i7-3930K CPU @ 3.20GHz
 # number of cpus      : 12 / 12 (online / possible)
 # memory info         : 13.2 / 23.5 GB (free / total)

tests/t196_chrome_taskname.py

@@ -27,7 +27,7 @@ def __init__(self):
 {"ts":13453314722.631,"ph":"E","pid":4694,"name":"task_name2"},
 {"ts":13453314722.695,"ph":"E","pid":4694,"name":"main"}
 ], "displayTimeUnit": "ns", "metadata": {
-"command_line":"../uftrace record --no-pager --no-event -L.. t-taskname",
+"command_line":"../uftrace record --no-pager --no-event --libmcount-path=.. t-taskname",
 "recorded_time":"Tue Jan 30 16:05:24 2018"
 } }
 """, sort='chrome')

uftrace.c

@@ -106,6 +106,7 @@ enum options {
 	OPT_with_syms,
 	OPT_clock,
 	OPT_usage,
+	OPT_libmcount_path,
 };
 
 __used static const char uftrace_usage[] =
@@ -175,7 +176,7 @@ __used static const char uftrace_help[] =
 "      --logfile=FILE         Save log messages to this file\n"
 "  -l, --nest-libcall         Show nested library calls\n"
 "      --libname              Show libname name with symbol name\n"
-"  -L, --library-path=PATH    Load libraries from this PATH\n"
+"      --libmcount-path=PATH  Load libmcount libraries from this PATH\n"
 "      --match=TYPE           Support pattern match: regex, glob (default:\n"
 "                             regex)\n"
 "      --max-stack=DEPTH      Set max stack depth to DEPTH (default: "
@@ -237,13 +238,14 @@ __used static const char uftrace_footer[] =
 "\n";
 
 static const char uftrace_shopts[] =
-	"+aA:b:C:d:D:eE:f:F:hH:kK:lL:N:P:r:R:s:S:t:T:U:vVW:Z:";
+	"+aA:b:C:d:D:eE:f:F:hH:kK:lN:P:r:R:s:S:t:T:U:vVW:Z:";
 
 #define REQ_ARG(name, shopt) { #name, required_argument, 0, shopt }
 #define NO_ARG(name, shopt)  { #name, no_argument, 0, shopt }
 
 static const struct option uftrace_options[] = {
-	REQ_ARG(library-path, 'L'),
+	REQ_ARG(libmcount-path, OPT_libmcount_path),
+	REQ_ARG(library-path, OPT_libmcount_path),
 	REQ_ARG(filter, 'F'),
 	REQ_ARG(notrace, 'L'),
 	REQ_ARG(depth, 'D'),
@@ -543,10 +545,6 @@ static char * remove_trailing_slash(char *path)
 static int parse_option(struct opts *opts, int key, char *arg)
 {
 	switch (key) {
-	case 'L':
-		opts->lib_path = arg;
-		break;
-
 	case 'F':
 		opts->filter = opt_add_string(opts->filter, arg);
 		break;
@@ -704,6 +702,10 @@ static int parse_option(struct opts *opts, int key, char *arg)
 	case 'h':
 		return -3;
 
+	case OPT_libmcount_path:
+		opts->lib_path = arg;
+		break;
+
 	case OPT_usage:
 		return -2;