X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemcp.cc;h=d76faeecca8d31da36e6f23d2ebec9a3e1ea813d;hb=dc1e22ba362663bf052e7cfbbdf933bb462a7006;hp=384622139e2990c008c4bb52db88c95186d8d2c2;hpb=aabc9fc24b965a3ac14bce9fd033aaba012c494b;p=awesomized%2Flibmemcached diff --git a/clients/memcp.cc b/clients/memcp.cc index 38462213..d76faeec 100644 --- a/clients/memcp.cc +++ b/clients/memcp.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -9,7 +10,7 @@ * */ -#include "config.h" +#include "mem_config.h" #include #include @@ -30,7 +31,7 @@ #include -#include +#include #include "client_options.h" #include "utilities.h" @@ -42,6 +43,8 @@ static void options_parse(int argc, char *argv[]); static bool opt_binary= false; +static bool opt_udp= false; +static bool opt_buffer= false; static int opt_verbose= 0; static char *opt_servers= NULL; static char *opt_hash= NULL; @@ -65,13 +68,13 @@ static long strtol_wrapper(const char *nptr, int base, bool *error) or (errno != 0 && val == 0)) { *error= true; - return EXIT_SUCCESS; + return 0; } if (endptr == nptr) { *error= true; - return EXIT_SUCCESS; + return 0; } *error= false; @@ -82,9 +85,47 @@ int main(int argc, char *argv[]) { options_parse(argc, argv); + + if (optind >= argc) + { + fprintf(stderr, "Expected argument after options\n"); + exit(EXIT_FAILURE); + } + initialize_sockets(); memcached_st *memc= memcached_create(NULL); + + if (opt_udp) + { + if (opt_verbose) + { + std::cout << "Enabling UDP" << std::endl; + } + + if (memcached_failed(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, opt_udp))) + { + memcached_free(memc); + std::cerr << "Could not enable UDP protocol." << std::endl; + return EXIT_FAILURE; + } + } + + if (opt_buffer) + { + if (opt_verbose) + { + std::cout << "Enabling MEMCACHED_BEHAVIOR_BUFFER_REQUESTS" << std::endl; + } + + if (memcached_failed(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, opt_buffer))) + { + memcached_free(memc); + std::cerr << "Could not enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS." << std::endl; + return EXIT_FAILURE; + } + } + process_hash_option(memc, opt_hash); if (opt_servers == NULL) @@ -95,28 +136,30 @@ int main(int argc, char *argv[]) { opt_servers= strdup(temp); } - else +#if 0 + else if (argc >= 1 and argv[--argc]) + { + opt_servers= strdup(argv[argc]); + } +#endif + + if (opt_servers == NULL) { std::cerr << "No Servers provided" << std::endl; exit(EXIT_FAILURE); } } - memcached_server_st *servers; - if (opt_servers) - { - servers= memcached_servers_parse(opt_servers); - } - else + memcached_server_st* servers= memcached_servers_parse(opt_servers); + if (servers == NULL or memcached_server_list_count(servers) == 0) { - servers= memcached_servers_parse(argv[--argc]); + std::cerr << "Invalid server list provided:" << opt_servers << std::endl; + return EXIT_FAILURE; } memcached_server_push(memc, servers); memcached_server_list_free(servers); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, - (uint64_t)opt_binary); - + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, opt_binary); if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0) { memcached_free(memc); @@ -151,7 +194,13 @@ int main(int argc, char *argv[]) } struct stat sbuf; - (void)fstat(fd, &sbuf); + if (fstat(fd, &sbuf) == -1) + { + std::cerr << "memcp " << argv[optind] << " " << strerror(errno) << std::endl; + optind++; + exit_code= EXIT_FAILURE; + continue; + } char *ptr= rindex(argv[optind], '/'); if (ptr) @@ -172,24 +221,33 @@ int main(int argc, char *argv[]) ptr, opt_flags, (unsigned long)opt_expires); } - char *file_buffer_ptr; - if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL) + // The file may be empty + char *file_buffer_ptr= NULL; + if (sbuf.st_size > 0) { - std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl; - exit(EXIT_FAILURE); - } + if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL) + { + std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl; + close(fd); + exit(EXIT_FAILURE); + } - ssize_t read_length; - if ((read_length= read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1) - { - std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl; - exit(EXIT_FAILURE); - } + ssize_t read_length; + if ((read_length= ::read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1) + { + std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl; + close(fd); + free(file_buffer_ptr); + exit(EXIT_FAILURE); + } - if (read_length != sbuf.st_size) - { - std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl; - exit(EXIT_FAILURE); + if (read_length != sbuf.st_size) + { + std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl; + close(fd); + free(file_buffer_ptr); + exit(EXIT_FAILURE); + } } memcached_return_t rc; @@ -212,17 +270,22 @@ int main(int argc, char *argv[]) opt_expires, opt_flags); } - if (rc != MEMCACHED_SUCCESS) + if (memcached_failed(rc)) { - std::cerr << "Error occrrured during operation: " << memcached_last_error_message(memc) << std::endl; + std::cerr << "Error occrrured during memcached_set(): " << memcached_last_error_message(memc) << std::endl; exit_code= EXIT_FAILURE; } - free(file_buffer_ptr); - close(fd); + ::free(file_buffer_ptr); + ::close(fd); optind++; } + if (opt_verbose) + { + std::cout << "Calling memcached_free()" << std::endl; + } + memcached_free(memc); if (opt_servers) @@ -250,6 +313,8 @@ static void options_parse(int argc, char *argv[]) {(OPTIONSTRING)"version", no_argument, NULL, OPT_VERSION}, {(OPTIONSTRING)"help", no_argument, NULL, OPT_HELP}, {(OPTIONSTRING)"quiet", no_argument, NULL, OPT_QUIET}, + {(OPTIONSTRING)"udp", no_argument, NULL, OPT_UDP}, + {(OPTIONSTRING)"buffer", no_argument, NULL, OPT_BUFFER}, {(OPTIONSTRING)"verbose", no_argument, &opt_verbose, OPT_VERBOSE}, {(OPTIONSTRING)"debug", no_argument, &opt_verbose, OPT_DEBUG}, {(OPTIONSTRING)"servers", required_argument, NULL, OPT_SERVERS}, @@ -320,10 +385,10 @@ static void options_parse(int argc, char *argv[]) case OPT_EXPIRE: /* --expire */ { bool strtol_error; - opt_expires= (time_t)strtol_wrapper(optarg, 16, &strtol_error); + opt_expires= (time_t)strtol_wrapper(optarg, 10, &strtol_error); if (strtol_error == true) { - fprintf(stderr, "Bad value passed via --flag\n"); + fprintf(stderr, "Bad value passed via --expire\n"); exit(1); } } @@ -357,6 +422,14 @@ static void options_parse(int argc, char *argv[]) close_stdio(); break; + case OPT_UDP: + opt_udp= true; + break; + + case OPT_BUFFER: + opt_buffer= true; + break; + case '?': /* getopt_long already printed an error message. */ exit(1);