diff options
| author | Dirk Manske <dm@nonitor.de> | 2010-09-30 11:33:33 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-09-30 22:20:52 +0200 |
| commit | 5fb4279ec7199e291d9bf4c903f89395f60a3d31 (patch) | |
| tree | 612b471c4674c8655fb6526ba6526383062117af /docs/examples/fopen.c | |
| parent | 67c83eb9eb491d6ec527e096b557d9cc689c2c08 (diff) | |
multi & hiper examples: updates and cleanups
all multi and hiper examples:
* don't loop curl_multi_perform calls, that was <7.20.0 style, currently
the exported multi functions will not return CURLM_CALL_MULTI_PERFORM
all hiper examples:
* renamed check_run_count to check_multi_info
* don't compare current running handle count with previous value, this
was the wrong way to check for finished requests, simply call
curl_multi_info_read
* it's also safe to call curl_multi_remove_handle inside the
curl_multi_info_read loop.
ghiper.c:
* replaced curl_multi_socket (that function is marked as obsolete) calls
with curl_multi_socket_action calls (as in hiperfifo.c and
evhiperfifo.c)
ghiper.c and evhiperfifo.c:
* be smart as hiperfifo.c, don't do uncessary curl_multi_* calls in
new_conn and main
Diffstat (limited to 'docs/examples/fopen.c')
| -rw-r--r-- | docs/examples/fopen.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/docs/examples/fopen.c b/docs/examples/fopen.c index f21526b29..1310993bd 100644 --- a/docs/examples/fopen.c +++ b/docs/examples/fopen.c @@ -184,12 +184,7 @@ fill_buffer(URL_FILE *file,int want,int waittime) default: /* timeout or readable/writable sockets */ - /* note we *could* be more efficient and not wait for - * CURLM_CALL_MULTI_PERFORM to clear here and check it on re-entry - * but that gets messy */ - while(curl_multi_perform(multi_handle, &file->still_running) == - CURLM_CALL_MULTI_PERFORM); - + curl_multi_perform(multi_handle, &file->still_running); break; } } while(file->still_running && (file->buffer_pos < want)); @@ -260,8 +255,7 @@ url_fopen(const char *url,const char *operation) curl_multi_add_handle(multi_handle, file->handle.curl); /* lets start the fetch */ - while(curl_multi_perform(multi_handle, &file->still_running) == - CURLM_CALL_MULTI_PERFORM ); + curl_multi_perform(multi_handle, &file->still_running); if((file->buffer_pos == 0) && (!file->still_running)) { |