diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Doxyfile | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/Doxyfile | 4 | ||||
| -rw-r--r-- | doc/memcached.1 | 2 | ||||
| -rw-r--r-- | doc/protocol-binary.xml | 2 | ||||
| -rw-r--r-- | doc/protocol.txt | 10 | ||||
| -rw-r--r-- | doc/threads.txt | 4 | ||||
| -rw-r--r-- | logger.h | 2 | ||||
| -rw-r--r-- | memcached.c | 10 | ||||
| -rw-r--r-- | memcached.h | 2 | ||||
| -rw-r--r-- | memcached.spec.in | 2 | ||||
| -rw-r--r-- | memcached_dtrace.d | 4 | ||||
| -rw-r--r-- | slabs.c | 6 | ||||
| -rw-r--r-- | t/chunked-items.t | 2 | ||||
| -rwxr-xr-x | t/getset.t | 2 | ||||
| -rw-r--r-- | t/issue_163.t | 2 | ||||
| -rwxr-xr-x | t/stats.t | 2 | ||||
| -rw-r--r-- | testapp.c | 2 |
19 files changed, 35 insertions, 35 deletions
@@ -150,7 +150,7 @@ 2007-11-19 Dormando <dormando@rydia.net> * Patch series from Tomash Brechko <tomash.brechko@gmail.com>: - Minor fixes and optimisations. + Minor fixes and optimizations. * Patches from Chris, Dustin, and Dormando to fix CAS. @@ -201,7 +201,7 @@ Patch from Maxim Dounin <mdounin@mdounin.ru> 2007-08-21 Paul Lindner <lindner@inuus.com> - * Incorporate incrememnt patch from Evan Miller + * Incorporate increment patch from Evan Miller <emiller@imvu.com> to define increment overflow behavior. @@ -57,7 +57,7 @@ CREATE_SUBDIRS = NO # Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, # Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), # Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, +# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, # Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English @@ -211,7 +211,7 @@ OPTIMIZE_OUTPUT_VHDL = NO # With this tag you can assign which parser to use for a given extension. # Doxygen has a built-in mapping, but you can override or extend it using this tag. # The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# the parsers supported by doxygen: IDL, Java, JavaScript, C#, C, C++, D, PHP, # Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat # .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), # use: inc=Fortran f=C @@ -532,7 +532,7 @@ WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for +# This WARN_NO_PARAMDOC option can be enabled to get warnings for # functions that are documented, but have no documentation for their parameters # or return value. If set to NO (the default) doxygen will only warn about # wrong or incomplete parameter documentation, but not about the absence of diff --git a/configure.ac b/configure.ac index 9311332..1e6fd1d 100644 --- a/configure.ac +++ b/configure.ac @@ -171,7 +171,7 @@ if test "x$enable_coverage" != "xno"; then CFLAGS="$CFLAGS -pthread" AC_PATH_PROG([PROFILER], [gcov], "no", [$PATH]) if test "x$PROFILER" != "xno"; then - # Issue 97: The existense of gcov doesn't mean we have -lgcov + # Issue 97: The existence of gcov doesn't mean we have -lgcov AC_CHECK_LIB(gcov, main, [ PROFILER_FLAGS="-fprofile-arcs -ftest-coverage" diff --git a/doc/Doxyfile b/doc/Doxyfile index e1b4afb..580730d 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -430,7 +430,7 @@ WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for +# This WARN_NO_PARAMDOC option can be enabled to get warnings for # functions that are documented, but have no documentation for their parameters # or return value. If set to NO (the default) doxygen will only warn about # wrong or incomplete parameter documentation, but not about the absence of @@ -602,7 +602,7 @@ REFERENCES_RELATION = YES # If the REFERENCES_LINK_SOURCE tag is set to YES (the default) # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. +# link to the source code. Otherwise they will link to the documentation. REFERENCES_LINK_SOURCE = YES diff --git a/doc/memcached.1 b/doc/memcached.1 index a0549ed..553cec4 100644 --- a/doc/memcached.1 +++ b/doc/memcached.1 @@ -143,7 +143,7 @@ Override the default size of each slab page. The default size is 1mb. Default value for this parameter is 1m, minimum is 1k, max is 128m. Adjusting this value changes the item size limit. Beware that this also increases the number of slabs (use \-v to view), and the -overal memory usage of memcached. +overall memory usage of memcached. .TP .B \-S Turn on SASL authentication. This option is only meaningful if memcached was diff --git a/doc/protocol-binary.xml b/doc/protocol-binary.xml index 7d8b60d..a466d80 100644 --- a/doc/protocol-binary.xml +++ b/doc/protocol-binary.xml @@ -1402,7 +1402,7 @@ Status (6,7) : 0x0000 Total body (8-11) : 0x00000007 Opaque (12-15): 0x00000000 CAS (16-23): 0x0000000000000000 -Exstras : None +Extras : None Key : The textual string "pid" Value : The textual string "3078" </artwork> diff --git a/doc/protocol.txt b/doc/protocol.txt index 79d03ac..d3652d6 100644 --- a/doc/protocol.txt +++ b/doc/protocol.txt @@ -657,10 +657,10 @@ integers separated by a colon (treat this as a floating point number). | cas_hits | 64u | Number of successful CAS reqs. | | cas_badval | 64u | Number of CAS reqs for which a key was | | | | found, but the CAS value did not match. | -| touch_hits | 64u | Numer of keys that have been touched with | -| | | a new expiration time | -| touch_misses | 64u | Numer of items that have been touched and | -| | | not found | +| touch_hits | 64u | Number of keys that have been touched | +| | | with a new expiration time | +| touch_misses | 64u | Number of items that have been touched | +| | | and not found | | auth_cmds | 64u | Number of authentication commands | | | | handled, success or failure. | | auth_errors | 64u | Number of failed authentications. | @@ -794,7 +794,7 @@ other stats command. | worker_logbuf_size| 32u | Size of internal per-worker-thread buffer | | | | which the background thread reads from. | | track_sizes | bool | If yes, a "stats sizes" histogram is being | -| | | dymamically tracked. | +| | | dynamically tracked. | | inline_ascii_response | | | bool | If yes, stores numbers from VALUE response | | | | inside an item, using up to 24 bytes. | diff --git a/doc/threads.txt b/doc/threads.txt index 9674deb..f92a65e 100644 --- a/doc/threads.txt +++ b/doc/threads.txt @@ -27,7 +27,7 @@ THIS HAS CHANGED! - Each LRU (and sub-LRU's in newer modes) has an independent lock. -- Raw accessses to the slab class are protected by a global slabs_lock. This +- Raw accesses to the slab class are protected by a global slabs_lock. This is a short lock which covers pushing and popping free memory. - item_lock must be held while modifying an item. @@ -49,7 +49,7 @@ Various locks exist for background threads. They can be used to pause the thread execution or update settings while the threads are idle. They may call item or lru locks. -A low priority isssue: +A low priority issue: - If you remove the per-thread stats lock, CPU usage goes down by less than a point of a percent, and it does not improve scalability. @@ -92,7 +92,7 @@ typedef struct _logentry { #define LOG_MUTATIONS (1<<3) /* set/append/incr/etc */ #define LOG_SYSERRORS (1<<4) /* malloc/etc errors */ #define LOG_CONNEVENTS (1<<5) /* new client, closed, etc */ -#define LOG_EVICTIONS (1<<6) /* defailts of evicted items */ +#define LOG_EVICTIONS (1<<6) /* details of evicted items */ #define LOG_STRICT (1<<7) /* block worker instead of drop */ #define LOG_RAWCMDS (1<<9) /* raw ascii commands */ diff --git a/memcached.c b/memcached.c index e2dcc05..1f1b858 100644 --- a/memcached.c +++ b/memcached.c @@ -5401,7 +5401,7 @@ static int server_socket_unix(const char *path, int access_mask) { setsockopt(sfd, SOL_SOCKET, SO_LINGER, (void *)&ling, sizeof(ling)); /* - * the memset call clears nonstandard fields in some impementations + * the memset call clears nonstandard fields in some implementations * that otherwise mess things up. */ memset(&addr, 0, sizeof(addr)); @@ -5517,7 +5517,7 @@ static void usage(void) { " the daemon with (not for -u <username> user;\n" " under sh this is done with 'ulimit -S -l NUM_KB').\n" "-v verbose (print errors/warnings while in event loop)\n" - "-vv very verbose (also print client commands/reponses)\n" + "-vv very verbose (also print client commands/responses)\n" "-vvv extremely verbose (also print internal state transitions)\n" "-h print this help and exit\n" "-i print memcached and libevent license\n" @@ -5936,7 +5936,7 @@ int main (int argc, char **argv) { /* process arguments */ while (-1 != (c = getopt(argc, argv, "a:" /* access mask for unix socket */ - "A" /* enable admin shutdown commannd */ + "A" /* enable admin shutdown command */ "p:" /* TCP port number to listen on */ "s:" /* unix socket path to listen on */ "U:" /* UDP port number to listen on */ @@ -6366,7 +6366,7 @@ int main (int argc, char **argv) { // chunk default should come after stitching is fixed. //settings.slab_chunk_size_max = 16384; - // With slab_ressign, pages are always 1MB, so anything larger + // With slab_reassign, pages are always 1MB, so anything larger // than .5m ends up using 1m anyway. With this we at least // avoid having several slab classes that use 1m. if (!slab_chunk_size_changed) { @@ -6646,7 +6646,7 @@ int main (int argc, char **argv) { /* * initialization order: first create the listening sockets * (may need root on low ports), then drop root if needed, - * then daemonise if needed, then init libevent (in some cases + * then daemonize if needed, then init libevent (in some cases * descriptors created by libevent wouldn't survive forking). */ diff --git a/memcached.h b/memcached.h index 1a760e6..b1abbda 100644 --- a/memcached.h +++ b/memcached.h @@ -446,7 +446,7 @@ typedef struct { uint8_t nkey; /* key length, w/terminating null and padding */ uint32_t remaining; /* Max keys to crawl per slab per invocation */ uint64_t reclaimed; /* items reclaimed during this crawl. */ - uint64_t unfetched; /* items reclaiemd unfetched during this crawl. */ + uint64_t unfetched; /* items reclaimed unfetched during this crawl. */ uint64_t checked; /* items examined during this crawl. */ } crawler; diff --git a/memcached.spec.in b/memcached.spec.in index c8ddd39..e065615 100644 --- a/memcached.spec.in +++ b/memcached.spec.in @@ -113,7 +113,7 @@ exit 0 - above suggestions from Bernard Johnson * Mon May 7 2007 Paul Lindner <lindner@inuus.com> - 1.2.2-2 -- Tidyness improvements suggested by Ruben Kerkhof in bugzilla #238994 +- Tidiness improvements suggested by Ruben Kerkhof in bugzilla #238994 * Fri May 4 2007 Paul Lindner <lindner@inuus.com> - 1.2.2-1 - Initial spec file created via rpmdev-newspec diff --git a/memcached_dtrace.d b/memcached_dtrace.d index 0fe132c..41617ff 100644 --- a/memcached_dtrace.d +++ b/memcached_dtrace.d @@ -172,7 +172,7 @@ provider memcached { /** * Fired when the processing of a command starts. * @param connid the connection id - * @param request the incomming request + * @param request the incoming request * @param size the size of the request */ probe process__command__start(int connid, const void *request, int size); @@ -180,7 +180,7 @@ provider memcached { /** * Fired when the processing of a command is done. * @param connid the connection id - * @param respnse the response to send back to the client + * @param response the response to send back to the client * @param size the size of the response */ probe process__command__end(int connid, const void *response, int size); @@ -700,7 +700,7 @@ static void *slab_rebalance_alloc(const size_t size, unsigned int id) { } /* CALLED WITH slabs_lock HELD */ -/* detatches item/chunk from freelist. */ +/* detaches item/chunk from freelist. */ static void slab_rebalance_cut_free(slabclass_t *s_cls, item *it) { /* Ensure this was on the freelist and nothing else. */ assert(it->it_flags == ITEM_SLABBED); @@ -1042,7 +1042,7 @@ static void *slab_rebalance_thread(void *arg) { while (do_run_slab_rebalance_thread) { if (slab_rebalance_signal == 1) { if (slab_rebalance_start() < 0) { - /* Handle errors with more specifity as required. */ + /* Handle errors with more specificity as required. */ slab_rebalance_signal = 0; } @@ -1150,7 +1150,7 @@ int start_slab_maintenance_thread(void) { } if (pthread_cond_init(&slab_rebalance_cond, NULL) != 0) { - fprintf(stderr, "Can't intiialize rebalance condition\n"); + fprintf(stderr, "Can't initialize rebalance condition\n"); return -1; } pthread_mutex_init(&slabs_rebalance_lock, NULL); diff --git a/t/chunked-items.t b/t/chunked-items.t index 6f4fc87..5dc9a3d 100644 --- a/t/chunked-items.t +++ b/t/chunked-items.t @@ -75,7 +75,7 @@ for (1..5) { $str .= $todo; my $len = length($todo); print $sock "append appender 0 0 $len\r\n$todo\r\n"; - is(scalar <$sock>, "STORED\r\n", "appened $todo size $len"); + is(scalar <$sock>, "STORED\r\n", "append $todo size $len"); print $sock "get appender\r\n"; my $header = scalar <$sock>; my $body = scalar <$sock>; @@ -69,7 +69,7 @@ print $sock "cas moo 0 0 6 $unique_id\r\nMOOVAL\r\n"; is(scalar <$sock>, "STORED\r\n"); mem_get_is($sock, "moo", "MOOVAL"); -# pipeling is okay +# pipeline is okay print $sock "set foo 0 0 6\r\nfooval\r\ndelete foo\r\nset foo 0 0 6\r\nfooval\r\ndelete foo\r\n"; is(scalar <$sock>, "STORED\r\n", "pipeline set"); is(scalar <$sock>, "DELETED\r\n", "pipeline delete"); diff --git a/t/issue_163.t b/t/issue_163.t index a5eb1ce..9931e37 100644 --- a/t/issue_163.t +++ b/t/issue_163.t @@ -34,4 +34,4 @@ is (scalar <$sock>, "STORED\r\n", "stored key"); my $stats = mem_stats($sock, "slabs"); my $requested2 = $stats->{"31:mem_requested"}; -is ($requested2, $requested, "we've not allocated and freed the same amont"); +is ($requested2, $requested, "we've not allocated and freed the same amount"); @@ -18,7 +18,7 @@ my $sock = $server->sock; ## STAT version 1.4.3 ## STAT libevent 1.4.13-stable. ## see doc/protocol.txt for others -# note that auth stats are tested in auth specfic tests +# note that auth stats are tested in auth specific tests my $stats = mem_stats($sock); @@ -153,7 +153,7 @@ static enum test_return cache_redzone_test(void) cache_t *cache = cache_create("test", sizeof(uint32_t), sizeof(char*), NULL, NULL); - /* Ignore SIGABORT */ + /* Ignore SIGABRT */ struct sigaction old_action; struct sigaction action = { .sa_handler = SIG_IGN, .sa_flags = 0}; sigemptyset(&action.sa_mask); |