ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-24 15:26:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Delay meshmb flush until http resume

Browse Source
This commit is contained in:
Jeremy Lakeman 2017-03-29 13:59:31 +10:30
parent fb2322d45f
commit a244c23a51
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meshmb_restful.c
View File

@ -592,6 +592,9 @@ static int restful_meshmb_feedlist_json_content_chunk(struct http_request *hr, s
.request = r, .request = r,
.buffer = b .buffer = b
}; };
int gen = meshmb_flush(r->u.meshmb_feeds.session->feeds);
if (gen>=0 && gen != r->u.meshmb_feeds.generation)
r->u.meshmb_feeds.generation = gen;
if (meshmb_enum(r->u.meshmb_feeds.session->feeds, &r->u.meshmb_feeds.bundle_id, restful_feedlist_enum, &state)!=0) if (meshmb_enum(r->u.meshmb_feeds.session->feeds, &r->u.meshmb_feeds.bundle_id, restful_feedlist_enum, &state)!=0)
return 0; return 0;
} }
@ -622,16 +625,7 @@ static void feedlist_on_rhizome_add(httpd_request *r, rhizome_manifest *m)
if (ret!=1) if (ret!=1)
return; return;
// TODO delay until resumed?
int gen = meshmb_flush(r->u.meshmb_feeds.session->feeds);
if (gen>=0 && gen != r->u.meshmb_feeds.generation){
if (r->u.meshmb_feeds.iterator){
meshmb_activity_close(r->u.meshmb_feeds.iterator);
r->u.meshmb_feeds.iterator = NULL;
}
r->u.meshmb_feeds.generation = gen;
http_request_resume_response(&r->http); http_request_resume_response(&r->http);
}
} }
static void feedlist_finalise(httpd_request *r) static void feedlist_finalise(httpd_request *r)
@ -701,6 +695,15 @@ static void activity_next(httpd_request *r){
} }
static void activity_iterator_open(httpd_request *r){ static void activity_iterator_open(httpd_request *r){
int gen = meshmb_flush(r->u.meshmb_feeds.session->feeds);
if (gen>=0 && gen != r->u.meshmb_feeds.generation){
if (r->u.meshmb_feeds.iterator){
meshmb_activity_close(r->u.meshmb_feeds.iterator);
r->u.meshmb_feeds.iterator = NULL;
}
r->u.meshmb_feeds.generation = gen;
}
if (r->u.meshmb_feeds.iterator) if (r->u.meshmb_feeds.iterator)
return; return;
struct meshmb_activity_iterator *iterator = meshmb_activity_open(r->u.meshmb_feeds.session->feeds); struct meshmb_activity_iterator *iterator = meshmb_activity_open(r->u.meshmb_feeds.session->feeds);