projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-223
[awesomized/libmemcached]
/
clients
/
memslap.cc
diff --git
a/clients/memslap.cc
b/clients/memslap.cc
index a8c0da1ed7b61a531dbbe66cbc86682eae2b22e6..d32b1c040e79b6e686506dd3d06f011ae8b11c20 100644
(file)
--- a/
clients/memslap.cc
+++ b/
clients/memslap.cc
@@
-2,7
+2,7
@@
*
* Libmemcached library
*
*
* Libmemcached library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2011
-2012
Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* Copyright (C) 2006-2009 Brian Aker All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-36,7
+36,7
@@
*/
*/
-#include <config.h>
+#include <
mem_
config.h>
#include <cassert>
#include <cstdio>
#include <cassert>
#include <cstdio>
@@
-55,7
+55,7
@@
#include <iostream>
#include <iostream>
-#include <libmemcached/memcached.h>
+#include <libmemcached
-1.0
/memcached.h>
#include "client_options.h"
#include "utilities.h"
#include "client_options.h"
#include "utilities.h"
@@
-159,7
+159,7
@@
test_t opt_test= SET_TEST;
extern "C" {
extern "C" {
-static void *run_task(void *p)
+static
__attribute__((noreturn))
void *run_task(void *p)
{
thread_context_st *context= (thread_context_st *)p;
{
thread_context_st *context= (thread_context_st *)p;
@@
-224,7
+224,15
@@
int main(int argc, char *argv[])
pthread_mutex_init(&sleeper_mutex, NULL);
pthread_cond_init(&sleep_threshhold, NULL);
pthread_mutex_init(&sleeper_mutex, NULL);
pthread_cond_init(&sleep_threshhold, NULL);
- scheduler(servers, &conclusion);
+ int error_code= EXIT_SUCCESS;
+ try {
+ scheduler(servers, &conclusion);
+ }
+ catch(std::exception& e)
+ {
+ std::cerr << "Died with exception: " << e.what() << std::endl;
+ error_code= EXIT_FAILURE;
+ }
free(opt_servers);
free(opt_servers);
@@
-233,7
+241,7
@@
int main(int argc, char *argv[])
conclusions_print(&conclusion);
memcached_server_list_free(servers);
conclusions_print(&conclusion);
memcached_server_list_free(servers);
- return
EXIT_SUCCESS
;
+ return
error_code
;
}
void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
}
void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
@@
-305,7
+313,7
@@
void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
pthread_t *threads= new (std::nothrow) pthread_t[opt_concurrency];
pthread_t *threads= new (std::nothrow) pthread_t[opt_concurrency];
- if (
not threads
)
+ if (
threads == NULL
)
{
exit(EXIT_FAILURE);
}
{
exit(EXIT_FAILURE);
}