comparison include/urweb/request.h @ 2206:c1a62ce47083

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 27 May 2014 21:38:01 -0400
parents c93fbd139732
children 35c1341b0179
comparison
equal deleted inserted replaced
2205:cdea39473c78 2206:c1a62ce47083
5 5
6 #include "types.h" 6 #include "types.h"
7 7
8 typedef struct uw_rc *uw_request_context; 8 typedef struct uw_rc *uw_request_context;
9 9
10 void uw_request_init(uw_app *app, void *logger_data, uw_logger log_error, uw_logger log_debug); 10 void uw_request_init(uw_app *app, uw_loggers* ls);
11 void uw_sign(const char *in, char *out); 11 void uw_sign(const char *in, char *out);
12 12
13 uw_request_context uw_new_request_context(void); 13 uw_request_context uw_new_request_context(void);
14 void uw_free_request_context(uw_request_context); 14 void uw_free_request_context(uw_request_context);
15 15
16 request_result uw_request(uw_request_context, uw_context, 16 request_result uw_request(uw_request_context rc, uw_context ctx,
17 char *method, char *path, char *query_string, 17 char *method, char *path, char *query_string,
18 char *body, size_t body_len, 18 char *body, size_t body_len,
19 void (*on_success)(uw_context), void (*on_failure)(uw_context), 19 void (*on_success)(uw_context), void (*on_failure)(uw_context),
20 void *logger_data, uw_logger log_error, uw_logger log_debug, 20 void *logger_data, uw_logger log_error, uw_logger log_debug,
21 int sock, 21 int sock,
22 int (*send)(int sockfd, const void *buf, ssize_t len), 22 int (*send)(int sockfd, const void *buf, ssize_t len),
23 int (*close)(int fd)); 23 int (*close)(int fd));
24 24
25 uw_context uw_request_new_context(int id, uw_app*, void *logger_data, uw_logger log_error, uw_logger log_debug); 25 uw_context uw_request_new_context(int id, uw_app *app, uw_loggers *ls);
26 26
27 typedef struct { 27 typedef struct {
28 uw_app *app; 28 uw_app *app;
29 void *logger_data; 29 uw_loggers *loggers;
30 uw_logger log_error, log_debug; 30 } pruner_data;
31 } loggers;
32 31
33 void *client_pruner(void *data); 32 void *client_pruner(void *data);
34 33
35 int pthread_create_big(pthread_t *outThread, void *foo, void *threadFunc, void *arg); 34 int pthread_create_big(pthread_t *outThread, void *foo, void *threadFunc, void *arg);
36 35