← Back to branch summary

~yshurik/libmemcached/libmemcached-win

« back to all changes in this revision

Viewing changes to libmemcached/storage.cc

  • Committer: Continuous Integration
  • Date: 2013-04-03 13:16:24 UTC
  • mfrom: (1100.1.1 libmemcached-1.2)
  • Revision ID: ci@tangent.org-20130403131624-j59dhv5z5l0lsdld
Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-250

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmemcached/storage.cc
139
139
}
140
140
 
141
141
static memcached_return_t memcached_send_binary(Memcached *ptr,
142
 
                                                org::libmemcached::Instance* server,
 
142
                                                memcached_instance_st* server,
143
143
                                                uint32_t server_key,
144
144
                                                const char *key,
145
145
                                                const size_t key_length,
218
218
        server_key= 0;
219
219
      }
220
220
 
221
 
      org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server_key);
 
221
      memcached_instance_st* instance= memcached_instance_fetch(ptr, server_key);
222
222
 
223
223
      if (memcached_vdo(instance, vector, 5, false) != MEMCACHED_SUCCESS)
224
224
      {
246
246
}
247
247
 
248
248
static memcached_return_t memcached_send_ascii(Memcached *ptr,
249
 
                                               org::libmemcached::Instance* instance,
 
249
                                               memcached_instance_st* instance,
250
250
                                               const char *key,
251
251
                                               const size_t key_length,
252
252
                                               const char *value,
373
373
  }
374
374
 
375
375
  uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
376
 
  org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server_key);
 
376
  memcached_instance_st* instance= memcached_instance_fetch(ptr, server_key);
377
377
 
378
378
  WATCHPOINT_SET(instance->io_wait_count.read= 0);
379
379
  WATCHPOINT_SET(instance->io_wait_count.write= 0);