Made sure that curl_global_init is called in all the multithreaded
example programs.
This commit is contained in:
@@ -23,6 +23,8 @@
|
||||
#include <pthread.h>
|
||||
#include <curl/curl.h>
|
||||
|
||||
#define NUMT 4
|
||||
|
||||
/* we have this global to let the callback get easy access to it */
|
||||
static pthread_mutex_t *lockarray;
|
||||
|
||||
@@ -89,7 +91,7 @@ void init_locks(void)
|
||||
#endif
|
||||
|
||||
/* List of URLs to fetch.*/
|
||||
const char *urls[]= {
|
||||
const char * const urls[]= {
|
||||
"https://www.sf.net/",
|
||||
"https://www.openssl.org/",
|
||||
"https://www.sf.net/",
|
||||
@@ -114,15 +116,18 @@ static void *pull_one_url(void *url)
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
pthread_t tid[4];
|
||||
pthread_t tid[NUMT];
|
||||
int i;
|
||||
int error;
|
||||
(void)argc; /* we don't use any arguments in this example */
|
||||
(void)argv;
|
||||
|
||||
/* Must initialize libcurl before any threads are started */
|
||||
curl_global_init(CURL_GLOBAL_ALL);
|
||||
|
||||
init_locks();
|
||||
|
||||
for(i=0; i< 4; i++) {
|
||||
for(i=0; i< NUMT; i++) {
|
||||
error = pthread_create(&tid[i],
|
||||
NULL, /* default attributes please */
|
||||
pull_one_url,
|
||||
@@ -134,7 +139,7 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
/* now wait for all threads to terminate */
|
||||
for(i=0; i< 4; i++) {
|
||||
for(i=0; i< NUMT; i++) {
|
||||
error = pthread_join(tid[i], NULL);
|
||||
fprintf(stderr, "Thread %d terminated\n", i);
|
||||
}
|
||||
|
Reference in New Issue
Block a user