Skip to content
This repository
Browse code

filename changed

  • Loading branch information...
commit d482f1891ffbc6653634e78b5cd17d73364144c1 1 parent 03ea237
happyfish100 authored
22 INSTALL
@@ -6,26 +6,26 @@ Please visit the FastDFS Home Page for more detail.
6 6 English language: http://english.csource.org/
7 7 Chinese language: http://www.csource.org/
8 8
  9 +#step 1. download libevent 1.4.x and install it
9 10
10   -#step 1. download FastDFS source package and unpack it,
11   -# if you use HTTP to download file, please download libevent 1.4.x and install it
12   -tar xzf FastDFS_v1.x.tar.gz
  11 +#step 2. download FastDFS source package and unpack it,
  12 +tar xzf FastDFS_v2.x.tar.gz
13 13 #for example:
14   -tar xzf FastDFS_v1.27.tar.gz
  14 +tar xzf FastDFS_v2.00.tar.gz
15 15
16   -#step 2. enter the FastDFS dir
  16 +#step 3. enter the FastDFS dir
17 17 cd FastDFS
18 18
19   -#step 3. if HTTP supported, modify make.sh, uncomment the line:
  19 +#step 4. if HTTP supported, modify make.sh, uncomment the line:
20 20 # WITH_HTTPD=1, then execute:
21 21 ./make.sh
22 22
23   -#step 4. make install
  23 +#step 5. make install
24 24 ./make.sh install
25 25
26   -#step 5. edit/modify the config file of tracker and storage
  26 +#step 6. edit/modify the config file of tracker and storage
27 27
28   -#step 6. run server programs
  28 +#step 7. run server programs
29 29 #start the tracker server:
30 30 /usr/local/bin/fdfs_trackerd /etc/fdfs/tracker.conf
31 31 #in Linux, you can start fdfs_trackerd as a service:
@@ -36,14 +36,14 @@ cd FastDFS
36 36 #in Linux, you can start fdfs_storaged as a service:
37 37 /sbin/service fdfs_storaged start
38 38
39   -#step 7. run test program
  39 +#step 8. run test program
40 40 #run the client test program:
41 41 /usr/local/bin/fdfs_test <client_conf_filename> <operation>
42 42 /usr/local/bin/fdfs_test1 <client_conf_filename> <operation>
43 43 #for example, upload a file:
44 44 /usr/local/bin/fdfs_test conf/client.conf upload /usr/include/stdlib.h
45 45
46   -#step 8. run monitor program
  46 +#step 9. run monitor program
47 47 #run the monitor program:
48 48 /usr/local/bin/fdfs_monitor <client_conf_filename>
49 49
2  tracker/Makefile.in
@@ -12,7 +12,7 @@ SHARED_OBJS = ../common/hash.o ../common/chain.o ../common/base64.o \
12 12 ../common/pthread_func.o ../common/md5.o \
13 13 tracker_proto.o tracker_mem.o tracker_service.o \
14 14 tracker_global.o tracker_func.o fast_task_queue.o \
15   - tracker_io.o $(TRACKER_HTTPD_OBJS)
  15 + tracker_nio.o $(TRACKER_HTTPD_OBJS)
16 16
17 17 ALL_OBJS = $(SHARED_OBJS)
18 18
2  tracker/tracker_io.c → tracker/tracker_nio.c
@@ -29,7 +29,7 @@
29 29 #include "tracker_proto.h"
30 30 #include "tracker_global.h"
31 31 #include "tracker_service.h"
32   -#include "tracker_io.h"
  32 +#include "tracker_nio.h"
33 33
34 34 static void client_sock_read(int sock, short event, void *arg);
35 35 static void client_sock_write(int sock, short event, void *arg);
6 tracker/tracker_io.h → tracker/tracker_nio.h
@@ -6,10 +6,10 @@
6 6 * Please visit the FastDFS Home Page http://www.csource.org/ for more detail.
7 7 **/
8 8
9   -//tracker_io.h
  9 +//tracker_nio.h
10 10
11   -#ifndef _TRACKER_IO_H
12   -#define _TRACKER_IO_H
  11 +#ifndef _TRACKER_NIO_H
  12 +#define _TRACKER_NIO_H
13 13
14 14 #include <stdio.h>
15 15 #include <stdlib.h>
2  tracker/tracker_service.c
@@ -29,7 +29,7 @@
29 29 #include "tracker_global.h"
30 30 #include "tracker_mem.h"
31 31 #include "tracker_proto.h"
32   -#include "tracker_io.h"
  32 +#include "tracker_nio.h"
33 33 #include "tracker_service.h"
34 34
35 35 #define PKG_LEN_PRINTF_FORMAT "%d"

0 comments on commit d482f18

Please sign in to comment.
Something went wrong with that request. Please try again.