Attachment #400200 for bug #545088

View | Details | Raw Unified | Return to bug 545088
Collapse All | Expand All

Lines 285-290 void memcached_servers_reset(memcached_st *shell) Link Here

(-)libmemcached/memcached.cc (+2 lines)
285	{	285	{
286	libmemcached_free(self, self->ketama.continuum);	286	libmemcached_free(self, self->ketama.continuum);
287	self->ketama.continuum= NULL;	287	self->ketama.continuum= NULL;
		288	self->ketama.continuum_count= 0;
		289	self->ketama.continuum_points_counter= 0;
288		290
289	memcached_instance_list_free(memcached_instance_list(self), self->number_of_hosts);	291	memcached_instance_list_free(memcached_instance_list(self), self->number_of_hosts);
290	memcached_instance_set(self, NULL, 0);	292	memcached_instance_set(self, NULL, 0);

Lines 452-457 collection_st collection[] ={ Link Here

(-)tests/libmemcached-1.0/all_tests.h (+1 lines)
452	{"hsieh_availability", 0, 0, hsieh_availability},	452	{"hsieh_availability", 0, 0, hsieh_availability},
453	{"murmur_availability", 0, 0, murmur_availability},	453	{"murmur_availability", 0, 0, murmur_availability},
454	{"memcached_server_add", (test_callback_fn*)memcached_servers_reset_SETUP, 0, memcached_server_add_TESTS},	454	{"memcached_server_add", (test_callback_fn*)memcached_servers_reset_SETUP, 0, memcached_server_add_TESTS},
		455	{"memcached_server_add(continuum)", (test_callback_fn*)memcached_servers_reset_CONTINUUM, 0, memcached_server_add_TESTS},
455	{"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP, 0, memcached_server_add_TESTS},	456	{"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP, 0, memcached_server_add_TESTS},
456	{"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP, 0, memcached_server_add_TESTS},	457	{"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP, 0, memcached_server_add_TESTS},
457	{"block", 0, 0, tests},	458	{"block", 0, 0, tests},




  return TEST_SUCCESS;
}

test_return_t memcached_servers_reset_CONTINUUM(memcached_st *memc)
{
  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_DISTRIBUTION_CONSISTENT);
  memcached_servers_reset(memc);
  test_compare(0, memc->ketama.continuum_count);
  // If memc->ketama.continuum_count is non-zero at this point, any call to
  // memcached_server_add will cause a segfault.
  return TEST_SUCCESS;
}

test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc)
{
  test_compare(TEST_SUCCESS, memcached_servers_reset_SETUP(memc));

Lines 64-66 test_return_t pre_buffer(memcached_st*); Link Here

(-)tests/libmemcached-1.0/setup_and_teardowns.h (+1 lines)
64	test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc);	64	test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc);
65	test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP(memcached_st *memc);	65	test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP(memcached_st *memc);
66	test_return_t memcached_servers_reset_SETUP(memcached_st *memc);	66	test_return_t memcached_servers_reset_SETUP(memcached_st *memc);
		67	test_return_t memcached_servers_reset_CONTINUUM(memcached_st *memc);

Return to bug 545088

Lines 177-182 test_return_t memcached_servers_reset_SETUP(memcached_st *memc) Link Here

(-)tests/libmemcached-1.0/setup_and_teardowns.cc (+10 lines)
177	return TEST_SUCCESS;	177	return TEST_SUCCESS;
178	}	178	}
179		179
		180	test_return_t memcached_servers_reset_CONTINUUM(memcached_st *memc)
		181	{
		182	memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_DISTRIBUTION_CONSISTENT);
		183	memcached_servers_reset(memc);
		184	test_compare(0, memc->ketama.continuum_count);
		185	// If memc->ketama.continuum_count is non-zero at this point, any call to
		186	// memcached_server_add will cause a segfault.
		187	return TEST_SUCCESS;
		188	}
		189
180	test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc)	190	test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc)
181	{	191	{
182	test_compare(TEST_SUCCESS, memcached_servers_reset_SETUP(memc));	192	test_compare(TEST_SUCCESS, memcached_servers_reset_SETUP(memc));