Optimize output string module

Author: greatriver

include/hdtd/context.h

@@ -214,6 +214,11 @@ void hd_free(hd_context *ctx, void *p);
 */
 void hd_flush_warnings(hd_context *ctx);
 
+enum {
+	HD_DEFAULT_CONTENT_SIZE  = 256,
+	HD_DEFAULT_EXTRACT_SIZE  = 128,
+};
+
 struct hd_context_s
 {
     void *user;
@@ -225,7 +230,8 @@ struct hd_context_s
 
 	//Extracted contents
 	unsigned int flush_size;
-	unsigned char contents[256];
+	unsigned int buf_pos;
+	unsigned char contents[HD_DEFAULT_CONTENT_SIZE];
 };
 
 enum {

include/hdtd/document.h

@@ -27,7 +27,7 @@ typedef void (hd_page_drop_page_fn)(hd_context *ctx, hd_page *page);
 	contents of a page. See hd_run_page_contents for more
 	information.
 */
-typedef void (hd_page_run_page_contents_fn)(hd_context *ctx, hd_page *page, char* buffer);
+typedef void (hd_page_run_page_contents_fn)(hd_context *ctx, hd_page *page, char* buffer, uint32_t *extract_len);
 
 /*
 	Structure definition is public so other classes can
@@ -167,6 +167,6 @@ void hd_drop_document(hd_context *ctx, hd_document *doc);
 */
 hd_page *hd_load_page(hd_context *ctx, hd_document *doc, int number);
 
-void hd_run_page_contents(hd_context *ctx, hd_page *page, char* buf);
+void hd_run_page_contents(hd_context *ctx, hd_page *page, char* buf, uint32_t *extract_len);
 
 #endif //HDCONTENTS_HDTD_DOCUMENT_H

include/pdf/page.h

@@ -25,7 +25,7 @@ pdf_obj *pdf_page_resources(hd_context *ctx, pdf_page *page);
 	pdf_run_page_contents: Interpret a loaded page and render it on a device.
 	Just the main page contents without the annotations
 */
-void pdf_run_page_contents(hd_context *ctx, pdf_page *page, char* buf);
+void pdf_run_page_contents(hd_context *ctx, pdf_page *page, char* buf, uint32_t *extract_len);
 
 /*
  * Page tree, pages and related objects

main.c

@@ -106,14 +106,14 @@ int main() {
 
     hd_page *page = hd_load_page(ctx, doc, 0);
     char buf[512] = {0};
-
+    uint32_t extract_len = 0;
     hd_try(ctx)
     {
-        hd_run_page_contents(ctx, page, buf);
+        hd_run_page_contents(ctx, page, buf, &extract_len);
         unsigned char filenameUtf8[128];
         memset(filenameUtf8, 0, 128);
 		unsigned int len;
-		len = (ctx->flush_size > 32) ? 32 : ctx->flush_size;
+		len = (extract_len > 32) ? 32 : extract_len;
 		if (len > 0)
 		{
 			unicode_to_utf8(filenameUtf8, (hd_wchar_t* )buf, len);

source/hdtd/context.c

@@ -86,6 +86,7 @@ hd_new_context_imp(const hd_alloc_context *alloc, size_t max_store, const char *
         return NULL;
 
     ctx->flush_size = 0;
+    ctx->buf_pos = 0;
     memset(ctx->contents, 0, sizeof(ctx->contents));
 
     /* Now initialise sections that are shared */

source/hdtd/document.c

@@ -139,13 +139,13 @@ hd_new_page_of_size(hd_context *ctx, int size)
 }
 
 void
-hd_run_page_contents(hd_context *ctx, hd_page *page, char* buf)
+hd_run_page_contents(hd_context *ctx, hd_page *page, char* buf, uint32_t *extract_len)
 {
     if (page && page->run_page_contents && page)
     {
         hd_try(ctx)
         {
-            page->run_page_contents(ctx, page, buf);
+            page->run_page_contents(ctx, page, buf, extract_len);
         }
         hd_catch(ctx)
         {

source/pdf/pdf-interpret.c

@@ -159,7 +159,7 @@ pdf_process_stream(hd_context *ctx, pdf_processor *proc, pdf_csi *csi, hd_stream
     pdf_token tok = PDF_TOK_ERROR;
     //whether to enter []
     int in_text_array = 0;
-    int syntax_errors = 0;
+    //int syntax_errors = 0;
 
     /* make sure we have a clean slate if we come here from flush_text */
     pdf_clear_stack(ctx, csi);
@@ -173,6 +173,8 @@ pdf_process_stream(hd_context *ctx, pdf_processor *proc, pdf_csi *csi, hd_stream
         {
             do
             {
+                if (ctx->buf_pos >= HD_DEFAULT_EXTRACT_SIZE)
+                    return;
                 tok = pdf_lex(ctx, stm, buf);
                 if (in_text_array)
                 {

source/pdf/pdf-op-run.c

@@ -35,9 +35,10 @@ pdf_show_char(hd_context *ctx, pdf_run_processor *pr, int cid)
 		ucslen = 1;
 	}
 
-	if ((ctx->flush_size < 62) && cid > 0 && ucslen > 0)
+	if ((ctx->buf_pos < HD_DEFAULT_EXTRACT_SIZE) && cid > 0 && ucslen > 0)
 	{
 		hd_wchar_t *wc = (hd_wchar_t *)&ucsbuf[0];
+        ctx->buf_pos += 2;
 		switch (*wc)
 		{
 			case '/':

source/pdf/pdf-run.c

@@ -37,15 +37,18 @@ pdf_run_page_contents_with_usage(hd_context *ctx, pdf_document *doc, pdf_page *p
         hd_rethrow(ctx);
 }
 
-void pdf_run_page_contents(hd_context *ctx, pdf_page *page, char* buf)
+void pdf_run_page_contents(hd_context *ctx, pdf_page *page, char* buf, uint32_t *extract_len)
 {
     pdf_document *doc = page->doc;
 
     hd_try(ctx)
     {
         pdf_run_page_contents_with_usage(ctx, doc, page);
         if (ctx->flush_size > 1)
+        {
+            *extract_len = ctx->flush_size;
             memcpy(buf, ctx->contents, ctx->flush_size);
+        }
     }
     hd_catch(ctx)
     {