Changeset 507

Show
Ignore:
Timestamp:
04/16/07 15:18:35 (2 years ago)
Author:
sgrimm
Message:

Merge a few more missing changes from trunk to multithreaded.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/multithreaded/api/perl/dev/bench.pl

    r299 r507  
    3232 
    3333srand(1); 
    34 my $to = 3000; 
     34my $to = shift || 3000; 
    3535for (1..$to) { 
    3636    warn "$_ / $to\n" if $_ % 100 == 0; 

  • branches/multithreaded/server/ChangeLog

    r499 r507  
    1111          null checks, adds asserts at the top of each function for any 
    1212          use of conn *c without checking to see if c is NULL first. 
     13 
     14        * Also adjust clean-whitespace.pl to clean *.ac files.  Add 
     15          script to test-suite to test for tabs. 
    1316 
    14172007-04-04  Paul Lindner  <lindner@inuus.com> 

  • branches/multithreaded/server/assoc.c

    r497 r507  
    481481    if (! primary_hashtable) { 
    482482        fprintf(stderr, "Failed to init hashtable.\n"); 
    483         exit(1); 
     483        exit(EXIT_FAILURE); 
    484484    } 
    485485    memset(primary_hashtable, 0, hash_size); 

  • branches/multithreaded/server/assoc.h

    r469 r507  
    66void do_assoc_move_next_bucket(void); 
    77uint32_t hash( const void *key, size_t length, const uint32_t initval); 
    8  

  • branches/multithreaded/server/daemon.c

    r506 r507  
    4949        break; 
    5050    default: 
    51         _exit(0); 
     51        _exit(EXIT_SUCCESS); 
    5252    } 
    5353 

  • branches/multithreaded/server/items.c

    r506 r507  
    237237void do_item_remove(item *it) { 
    238238    assert((it->it_flags & ITEM_SLABBED) == 0); 
    239     if (it->refcount) { 
     239    if (it->refcount != 0) { 
    240240        it->refcount--; 
    241241        DEBUG_REFCNT(it, '-'); 

  • branches/multithreaded/server/items.h

    r474 r507  
    66bool item_size_ok(const size_t nkey, const int flags, const int nbytes); 
    77 
    8 int  do_item_link(item *it);    /* may fail if transgresses limits */ 
     8int  do_item_link(item *it);    /* may fail if transgresses limits */ 
    99void do_item_unlink(item *it); 
    1010void do_item_remove(item *it); 

  • branches/multithreaded/server/memcached.c

    r506 r507  
    9898 
    9999void pre_gdb(void); 
    100 void conn_free(conn *c); 
     100static void conn_free(conn *c); 
    101101 
    102102/** exported globals **/ 
    …… 
    18681868                        fprintf(stderr, "Too many open connections\n"); 
    18691869                    accept_new_conns(false); 
    1870                     stop = 1; 
     1870                    stop = true; 
    18711871                } else { 
    18721872                    perror("accept()"); 
    1873                     stop = 1; 
     1873                    stop = true; 
    18741874                } 
    18751875                break; 

  • branches/multithreaded/server/slabs.c

    r506 r507  
    154154       these three lines.  */ 
    155155 
    156     for(i = POWER_SMALLEST; i <= POWER_LARGEST; i++) { 
     156    for (i = POWER_SMALLEST; i <= POWER_LARGEST; i++) { 
    157157        if (++prealloc > maxslabs) 
    158158            return; 

  • branches/multithreaded/website/apis.bml

    r488 r507  
    1919<?h1 PHP API h1?> 
    2020 
    21 <p>There are tons of PHP libraries available, in different conditions.  The community hasn't yet decided which is the best.  When they do, let me know.  For now I'll let you search Google rather than link any.</p> 
     21<p>There are tons of PHP libraries available, in different conditions.  But it now seems there's an official one:</p> 
     22<ul> 
     23<li><a href="http://pecl.php.net/package/memcache">PHP PECL memcached client</a> -- official PHP client</li> 
     24</ul> 
    2225 
    2326<?h1 Python API h1?>