Skip to content

Commit b77c7f5

Browse files
committed
Remove pthread
1 parent 5b39a38 commit b77c7f5

File tree

1 file changed

+4
-49
lines changed

1 file changed

+4
-49
lines changed

src/chsrc-framework.h

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "xy.h"
1616
#include "source.h"
17-
#include <pthread.h>
17+
// #include <pthread.h>
1818

1919
#define App_Name "chsrc"
2020

@@ -547,8 +547,6 @@ measure_speed_for_every_source (SourceInfo sources[], int size, double speed_rec
547547

548548
double speed = 0.0;
549549

550-
pthread_t *threads = xy_malloc0 (sizeof(pthread_t) * size);
551-
552550
for (int i=0; i<size; i++)
553551
{
554552
SourceInfo src = sources[i];
@@ -584,54 +582,11 @@ measure_speed_for_every_source (SourceInfo sources[], int size, double speed_rec
584582

585583
char *url_ = xy_strdup (url);
586584

587-
if (CliOpt_Parallel)
588-
{
589-
int ret = pthread_create (&threads[i], NULL, measure_speed_for_url, url_);
590-
if (ret!=0)
591-
{
592-
chsrc_error ("Unable to measure speed\n");
593-
exit (Exit_UserCause);
594-
}
595-
else
596-
{
597-
get_measured[i] = true;
598-
get_measured_n += 1;
599-
}
600-
}
601-
else
602-
{
603-
char *curl_result = measure_speed_for_url (url_);
604-
double speed = parse_and_say_curl_result (curl_result);
605-
speed_records[i] = speed;
606-
}
585+
char *curl_result = measure_speed_for_url (url_);
586+
double speed = parse_and_say_curl_result (curl_result);
587+
speed_records[i] = speed;
607588
}
608589
}
609-
610-
611-
if (CliOpt_Parallel)
612-
{
613-
/* 汇总 */
614-
char **curl_results = xy_malloc0 (sizeof(char *) * size);
615-
for (int i=0; i<size; i++)
616-
{
617-
if (get_measured[i]==true)
618-
pthread_join (threads[i], (void *)&curl_results[i]);
619-
}
620-
621-
for (int i=0; i<get_measured_n; i++)
622-
printf("\033[A\033[2K");
623-
624-
for (int i=0; i<size; i++)
625-
{
626-
if (get_measured[i]==true)
627-
{
628-
printf ("%s", measure_msgs[i]);
629-
double speed = parse_and_say_curl_result (curl_results[i]);
630-
speed_records[i] = speed;
631-
}
632-
}
633-
/* 汇总结束 */
634-
} /* End of if Parallel*/
635590
}
636591

637592

0 commit comments

Comments
 (0)