Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading

Browse Source
This commit is contained in:
Siana Gearz
2012-07-05 06:06:04 +02:00
parent d31c062693 df20f918ba
commit f5bfab139c
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/CURL.cmake
View File

@@ -1,7 +1,7 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
set(CURL_FIND_QUIETLY ON) set(CURL_FIND_QUIETLY OFF)
set(CURL_FIND_REQUIRED ON) set(CURL_FIND_REQUIRED ON)
if (STANDALONE) if (STANDALONE)

1
indra/cwdebug/debug.cc
View File

@@ -174,6 +174,7 @@ void stop_recording_backtraces(void)
channel_ct statemachine DDCN("STATEMACHINE"); //!< This debug channel is used for output related to class AIStateMachine. channel_ct statemachine DDCN("STATEMACHINE"); //!< This debug channel is used for output related to class AIStateMachine.
channel_ct caps DDCN("CAPS"); //!< This debug channel is used for output related to Capabilities. channel_ct caps DDCN("CAPS"); //!< This debug channel is used for output related to Capabilities.
channel_ct curl DDCN("CURL"); //!< This debug channel is used for output related to Curl. channel_ct curl DDCN("CURL"); //!< This debug channel is used for output related to Curl.
channel_ct curlio DDCN("CURLIO"); //!< This debug channel is used to print debug output of libcurl.
} // namespace dc } // namespace dc
} // namespace DEBUGCHANNELS } // namespace DEBUGCHANNELS

1
indra/cwdebug/debug.h
View File

@@ -119,6 +119,7 @@ extern CWD_API channel_ct backtrace;
extern CWD_API channel_ct statemachine; extern CWD_API channel_ct statemachine;
extern CWD_API channel_ct caps; extern CWD_API channel_ct caps;
extern CWD_API channel_ct curl; extern CWD_API channel_ct curl;
extern CWD_API channel_ct curlio;
#endif #endif

16
indra/llmessage/aicurl.cpp
View File

@@ -508,12 +508,12 @@ LLAtomicU32 Stats::multi_errors;
//static //static
void Stats::print(void) void Stats::print(void)
{ {
llinfos << "====== CURL STATS ======" << llendl; llinfos << "============ CURL STATS ============" << llendl;
llinfos << " Curl multi errors/calls: " << std::dec << multi_errors << "/" << multi_calls << llendl; llinfos << " Curl multi errors/calls : " << std::dec << multi_errors << "/" << multi_calls << llendl;
llinfos << " Curl easy errors/calls: " << std::dec << easy_errors << "/" << easy_calls << llendl; llinfos << " Curl easy errors/calls : " << std::dec << easy_errors << "/" << easy_calls << llendl;
llinfos << " curl_easy_init() errors/calls: " << std::dec << easy_init_errors << "/" << easy_init_calls << llendl; llinfos << " curl_easy_init() errors/calls : " << std::dec << easy_init_errors << "/" << easy_init_calls << llendl;
llinfos << " Current number of curl easy handles: " << std::dec << (easy_init_calls - easy_init_errors - easy_cleanup_calls) << llendl; llinfos << " Current number of curl easy handles: " << std::dec << (easy_init_calls - easy_init_errors - easy_cleanup_calls) << llendl;
llinfos << "=== END OF CURL STATS ===" << llendl; llinfos << "========= END OF CURL STATS =========" << llendl;
} }
// THREAD-SAFE // THREAD-SAFE
@@ -838,7 +838,7 @@ static int curl_debug_callback(CURL*, curl_infotype infotype, char* buf, size_t
marker << (void*)request->get_lockobj(); marker << (void*)request->get_lockobj();
libcw_do.push_marker(); libcw_do.push_marker();
libcw_do.marker().assign(marker.str().data(), marker.str().size()); libcw_do.marker().assign(marker.str().data(), marker.str().size());
LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcw_do, dc::curl|cond_nonewline_cf(infotype == CURLINFO_TEXT)) LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcw_do, dc::curlio|cond_nonewline_cf(infotype == CURLINFO_TEXT))
switch (infotype) switch (infotype)
{ {
case CURLINFO_TEXT: case CURLINFO_TEXT:
@@ -930,17 +930,15 @@ void CurlEasyRequest::applyDefaultOptions(void)
//setopt(CURLOPT_DNS_CACHE_TIMEOUT, 0); //setopt(CURLOPT_DNS_CACHE_TIMEOUT, 0);
// Set the CURL options for either SOCKS or HTTP proxy. // Set the CURL options for either SOCKS or HTTP proxy.
applyProxySettings(); applyProxySettings();
#if 0
// Cause libcurl to print all it's I/O traffic on the debug channel. // Cause libcurl to print all it's I/O traffic on the debug channel.
Debug( Debug(
if (dc::curl.is_on()) if (dc::curlio.is_on())
{ {
setopt(CURLOPT_VERBOSE, 1); setopt(CURLOPT_VERBOSE, 1);
setopt(CURLOPT_DEBUGFUNCTION, &curl_debug_callback); setopt(CURLOPT_DEBUGFUNCTION, &curl_debug_callback);
setopt(CURLOPT_DEBUGDATA, this); setopt(CURLOPT_DEBUGDATA, this);
} }
); );
#endif
} }
void CurlEasyRequest::finalizeRequest(std::string const& url) void CurlEasyRequest::finalizeRequest(std::string const& url)