projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge
[m6w6/libmemcached]
/
tests
/
function.c
diff --git
a/tests/function.c
b/tests/function.c
index 54bbceaabc409d355841f034d631834aa92e9bd7..db224f952208a64662ccfab7d3535462383bb5d1 100644
(file)
--- a/
tests/function.c
+++ b/
tests/function.c
@@
-29,8
+29,6
@@
static pairs_st *global_pairs;
static char *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
static pairs_st *global_pairs;
static char *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
-static char *global_values[GLOBAL_COUNT];
-static size_t global_values_length[GLOBAL_COUNT];
uint8_t init_test(memcached_st *not_used)
{
uint8_t init_test(memcached_st *not_used)
{
@@
-139,7
+137,7
@@
uint8_t set_test(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
return 0;
}
return 0;
}
@@
-358,11
+356,12
@@
uint8_t add_test(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
memcached_quit(memc);
rc= memcached_add(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
memcached_quit(memc);
rc= memcached_add(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
+ WATCHPOINT_ERROR(rc);
assert(rc == MEMCACHED_NOTSTORED);
return 0;
assert(rc == MEMCACHED_NOTSTORED);
return 0;
@@
-401,10
+400,10
@@
uint8_t delete_test(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
rc= memcached_delete(memc, key, strlen(key), (time_t)0);
rc= memcached_delete(memc, key, strlen(key), (time_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
return 0;
}
return 0;
}
@@
-428,7
+427,7
@@
uint8_t get_test(memcached_st *memc)
uint32_t flags;
rc= memcached_delete(memc, key, strlen(key), (time_t)0);
uint32_t flags;
rc= memcached_delete(memc, key, strlen(key), (time_t)0);
- assert(rc == MEMCACHED_
SUCCESS
|| rc == MEMCACHED_NOTFOUND);
+ assert(rc == MEMCACHED_
BUFFERED
|| rc == MEMCACHED_NOTFOUND);
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
@@
-452,7
+451,7
@@
uint8_t get_test2(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
@@
-480,7
+479,7
@@
uint8_t set_test2(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, value_length,
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, value_length,
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
}
return 0;
}
return 0;
@@
-505,7
+504,7
@@
uint8_t set_test3(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, value_length,
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, value_length,
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
}
free(value);
}
free(value);
@@
-533,7
+532,7
@@
uint8_t get_test3(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, value_length,
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, value_length,
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
@@
-569,7
+568,7
@@
uint8_t get_test4(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, value_length,
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, value_length,
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
for (x= 0; x < 10; x++)
{
for (x= 0; x < 10; x++)
{
@@
-610,7
+609,7
@@
uint8_t increment_test(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
rc= memcached_increment(memc, key, strlen(key),
1, &new_number);
rc= memcached_increment(memc, key, strlen(key),
1, &new_number);
@@
-635,7
+634,7
@@
uint8_t decrement_test(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
rc= memcached_decrement(memc, key, strlen(key),
1, &new_number);
rc= memcached_decrement(memc, key, strlen(key),
1, &new_number);
@@
-659,13
+658,13
@@
uint8_t quit_test(memcached_st *memc)
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)10, (uint32_t)3);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)10, (uint32_t)3);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
memcached_quit(memc);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)50, (uint32_t)9);
memcached_quit(memc);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)50, (uint32_t)9);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
return 0;
}
return 0;
}
@@
-705,7
+704,7
@@
uint8_t mget_result_test(memcached_st *memc)
rc= memcached_set(memc, keys[x], key_length[x],
keys[x], key_length[x],
(time_t)50, (uint32_t)9);
rc= memcached_set(memc, keys[x], key_length[x],
keys[x], key_length[x],
(time_t)50, (uint32_t)9);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
}
rc= memcached_mget(memc, keys, key_length, 3);
}
rc= memcached_mget(memc, keys, key_length, 3);
@@
-755,7
+754,7
@@
uint8_t mget_result_alloc_test(memcached_st *memc)
rc= memcached_set(memc, keys[x], key_length[x],
keys[x], key_length[x],
(time_t)50, (uint32_t)9);
rc= memcached_set(memc, keys[x], key_length[x],
keys[x], key_length[x],
(time_t)50, (uint32_t)9);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
}
rc= memcached_mget(memc, keys, key_length, 3);
}
rc= memcached_mget(memc, keys, key_length, 3);
@@
-803,7
+802,7
@@
uint8_t mget_result_function(memcached_st *memc)
rc= memcached_set(memc, keys[x], key_length[x],
keys[x], key_length[x],
(time_t)50, (uint32_t)9);
rc= memcached_set(memc, keys[x], key_length[x],
keys[x], key_length[x],
(time_t)50, (uint32_t)9);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
}
rc= memcached_mget(memc, keys, key_length, 3);
}
rc= memcached_mget(memc, keys, key_length, 3);
@@
-852,7
+851,7
@@
uint8_t mget_test(memcached_st *memc)
rc= memcached_set(memc, keys[x], key_length[x],
keys[x], key_length[x],
(time_t)50, (uint32_t)9);
rc= memcached_set(memc, keys[x], key_length[x],
keys[x], key_length[x],
(time_t)50, (uint32_t)9);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
}
rc= memcached_mget(memc, keys, key_length, 3);
}
rc= memcached_mget(memc, keys, key_length, 3);
@@
-1037,10
+1036,10
@@
uint8_t user_supplied_bug1(memcached_st *memc)
rc = memcached_set(memc, key, strlen(key),
randomstuff, strlen(randomstuff), 10, 0);
/* If we fail, lets try again */
rc = memcached_set(memc, key, strlen(key),
randomstuff, strlen(randomstuff), 10, 0);
/* If we fail, lets try again */
- if (rc != MEMCACHED_SUCCESS)
+ if (rc != MEMCACHED_SUCCESS
&& rc != MEMCACHED_BUFFERED
)
rc = memcached_set(memc, key, strlen(key),
randomstuff, strlen(randomstuff), 10, 0);
rc = memcached_set(memc, key, strlen(key),
randomstuff, strlen(randomstuff), 10, 0);
- assert(rc == MEMCACHED_SUCCESS);
+ assert(rc == MEMCACHED_SUCCESS
|| rc == MEMCACHED_BUFFERED
);
}
return 0;
}
return 0;
@@
-1481,7
+1480,7
@@
uint8_t user_supplied_bug10(memcached_st *memc)
memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_NO_BLOCK, &set);
memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_TCP_NODELAY, &set);
timeout= 2;
memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_NO_BLOCK, &set);
memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_TCP_NODELAY, &set);
timeout= 2;
- memcached_behavior_set(m
emc
, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, &timeout);
+ memcached_behavior_set(m
clone
, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, &timeout);
value = (char*)malloc(value_length * sizeof(char));
value = (char*)malloc(value_length * sizeof(char));
@@
-1492,7
+1491,7
@@
uint8_t user_supplied_bug10(memcached_st *memc)
{
rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0);
{
rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0);
- assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE);
+ assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE
|| rc == MEMCACHED_BUFFERED
);
if (rc == MEMCACHED_WRITE_FAILURE)
x--;
if (rc == MEMCACHED_WRITE_FAILURE)
x--;
@@
-1522,7
+1521,7
@@
uint8_t user_supplied_bug11(memcached_st *memc)
memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_NO_BLOCK, &set);
memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_TCP_NODELAY, &set);
timeout= -1;
memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_NO_BLOCK, &set);
memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_TCP_NODELAY, &set);
timeout= -1;
- memcached_behavior_set(m
emc
, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, &timeout);
+ memcached_behavior_set(m
clone
, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, &timeout);
timeout= (int32_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT);
timeout= (int32_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT);
@@
-1538,7
+1537,6
@@
uint8_t user_supplied_bug11(memcached_st *memc)
rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0);
WATCHPOINT_IFERROR(rc);
rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0);
WATCHPOINT_IFERROR(rc);
- //assert(rc == MEMCACHED_SUCCESS);
}
free(value);
}
free(value);
@@
-1686,6
+1684,17
@@
uint8_t generate_data(memcached_st *memc)
return 0;
}
return 0;
}
+uint8_t generate_buffer_data(memcached_st *memc)
+{
+ int latch= 0;
+
+ latch= 1;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, &latch);
+ generate_data(memc);
+
+ return 0;
+}
+
#ifdef NOT_DONE
uint8_t mset_data(memcached_st *memc)
{
#ifdef NOT_DONE
uint8_t mset_data(memcached_st *memc)
{
@@
-1809,16
+1818,22
@@
uint8_t delete_generate(memcached_st *memc)
return 0;
}
return 0;
}
-uint8_t
mdelete
_generate(memcached_st *memc)
+uint8_t
delete_buffer
_generate(memcached_st *memc)
{
{
- memcached_return rc;
+ int latch= 0;
+ unsigned int x;
- rc= memcached_mdelete(memc, global_keys, global_keys_length, GLOBAL_COUNT, 0);
+ latch= 1;
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, &latch);
+
+ for (x= 0; x < GLOBAL_COUNT; x++)
+ {
+ (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0);
+ }
return 0;
}
return 0;
}
-
uint8_t free_data(memcached_st *memc)
{
pairs_free(global_pairs);
uint8_t free_data(memcached_st *memc)
{
pairs_free(global_pairs);
@@
-2112,15
+2127,16
@@
test_st user_tests[] ={
};
test_st generate_tests[] ={
};
test_st generate_tests[] ={
- {"generate_data",
0
, generate_data },
+ {"generate_data",
1
, generate_data },
{"get_read", 0, get_read },
{"delete_generate", 0, delete_generate },
{"get_read", 0, get_read },
{"delete_generate", 0, delete_generate },
- {"generate_data", 0, generate_data },
+ {"generate_buffer_data", 1, generate_buffer_data },
+ {"delete_buffer", 0, delete_buffer_generate},
+ {"generate_data", 1, generate_data },
{"mget_read", 0, mget_read },
{"mget_read_result", 0, mget_read_result },
{"mget_read_function", 0, mget_read_function },
{"mget_read", 0, mget_read },
{"mget_read_result", 0, mget_read_result },
{"mget_read_function", 0, mget_read_function },
- {"mdelete_generate", 0, mdelete_generate },
- {"cleanup", 0, cleanup_pairs },
+ {"cleanup", 1, cleanup_pairs },
{0, 0, 0}
};
{0, 0, 0}
};