changeset 29:894a300f199f default tip

change default output
author Kaito Tokumori <e105711@ie.u-ryukyu.ac.jp>
date Tue, 03 Nov 2015 18:17:48 +0900
parents 5a7ce082651f
children
files meta_connector/meta_connect_test.c meta_connector/meta_connector.py
diffstat 2 files changed, 16 insertions(+), 229 deletions(-) [+]
line wrap: on
line diff
--- a/meta_connector/meta_connect_test.c	Mon Nov 02 04:17:33 2015 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,226 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "synchronizedQueueContext.h"
-
-#include "allocate.h"
-#include "origin_cs.h"
-
-#ifdef CLANG
-#define _CbC_retrun __return
-#define _CbC_environment __environment
-#endif
-
-#define NUM 100
-
-extern __code initSynchronizedQueueContext(struct Context* context);
-
-//__code code1(struct Context* context) {
-//    context->data[Allocate]->allocate.size = sizeof(struct Element);
-//    context->data[Allocate]->allocate.next = Code2;
-//    goto meta(context, Allocator);
-//}
-
-__code meta(struct Context* context, enum Code next) {
-    goto (context->code[next])(context);
-}
-
-//__code code2(struct Context* context) {
-//    context->data[Allocate]->allocate.after_put = Code3;
-//    context->data[context->dataNum] -> element.value = 1024;
-//    goto meta(context, Sender);
-//}
-
-__code code1(struct Allocate* allocate) {
-    allocate->size = sizeof(long);
-    allocate->next = Code2;
-    goto allocator();
-}
-
-__code code1_stub(struct Context* context) {
-    goto code1(context, &context->data[Allocate]->allocate);
-}
-
-__code code2(long* count) {
-    *count = 0;
-    goto meta(context, Code3);
-}
-
-__code code2_stub(struct Context* context) {
-    goto code2(context, &context->data[Counter]->count);
-}
-
-__code code3(long* count, struct Allocate* allocate) {
-    long loop = *count;
-    if(loop == NUM) {
-        goto meta(context, ThreadExit);
-    }
-    allocate->size = sizeof(struct Element);
-    allocate->next = Code4;
-    goto meta(context, Allocator);
-}
-
-__code code3_stub(struct Context* context) {
-    goto code3(context, &context->data[Counter]->count, &context->data[Allocate]->allocate);
-}
-
-__code code4(long* count, struct Allocate* allocate, struct Element* element) {
-    allocate->after_put = Code3;
-    element->value = (*count)++;
-    goto meta(context, Sender);
-}
-
-__code code4_stub(struct Context* context) {
-    goto code4(context, &context->data[Counter]->count, &context->data[Allocate]->allocate, &context->data[context->dataNum]->element);
-}
-
-__code meta_sender(struct Context* context, struct Queue* queue, enum Code next) {
-    // lock
-    pthread_mutex_lock(&queue->mutex);
-    goto (context->code[next])(context);
-}
-
-__code sender(struct Queue* queue) {
-  //    goto meta_sender(context, queue, Put);
-  goto put(queue);
-}
-
-__code sender_stub(struct Context* context) {
-    goto sender(context, &context->data[Queue]->queue);
-}
-
-__code meta_put(struct Context* context, struct Queue* queue, enum Code next) {
-    // signal
-    pthread_cond_signal(&queue->cond);
-    // unlock
-    pthread_mutex_unlock(&queue->mutex);
-    goto (context->code[next])(context);
-}
-
-__code put(struct Allocate* allocate, struct Queue* queue, struct Element* element) {
-    if(queue->first) {
-        queue->last->next = element;
-    } else {
-        queue->first = element;
-    }
-    queue->last   = element;
-    element->next = 0;
-    queue->count++;
-    printf("Put %d\n\n", element->value);
-    goto meta_put(context, queue, allocate->after_put);
-}
-
-__code put_stub(struct Context* context) {
-    goto put(context, &context->data[Allocate]->allocate, &context->data[Queue]->queue, &context->data[context->dataNum]->element);
-}
-
-__code code5(struct Allocate* allocate) {
-    allocate->size = sizeof(long);
-    allocate->next = Code6;
-    goto meta(context, Allocator);
-}
-
-__code code5_stub(struct Context* context) {
-    goto code5(context, &context->data[Allocate]->allocate);
-}
-
-__code code6(long* count) {
-    *count = 0;
-    goto meta(context, Code7);
-}
-
-__code code6_stub(struct Context* context) {
-    goto code6(context, &context->data[Counter]->count);
-}
-
-__code code7(long* count, struct Allocate* allocate) {
-    long loop = *count;
-    if(loop == NUM) {
-        goto meta(context, ThreadExit);
-    }
-    (*count)++;
-    allocate->after_get = Code7;
-    goto meta(context, Receiver);
-}
-
-__code code7_stub(struct Context* context) {
-    goto code7(context, &context->data[Counter]->count, &context->data[Allocate]->allocate);
-}
-
-__code meta_receiver(struct Context* context, struct Queue* queue, enum Code next) {
-    // lock
-    pthread_mutex_lock(&queue->mutex);
-    goto (context->code[next])(context);
-}
-
-__code receiver(struct Queue* queue) {
-  //    goto meta_receiver(context, queue, Get);
-  goto get(queue);
-}
-
-__code receiver_stub(struct Context* context) {
-    goto receiver(context, &context->data[Queue]->queue);
-}
-__code meta_get(struct Context* context, enum Code next) {
-    pthread_mutex_unlock(&context->data[Queue]->queue.mutex);
-    goto (context->code[next])(context);
-}
-
-__code get(struct Allocate* allocate, struct Queue* queue, struct Element* element) {
-    // thread wait if queue is empty
-    while (queue->count == 0) {
-        pthread_cond_wait(&queue->cond, &queue->mutex);
-    }
-    printf("      Get %d\n\n", queue->first->value);
-    queue->first = (queue->first->next) ? queue->first->next : 0;
-    queue->count--;
-    goto meta_get(context, allocate->after_get);
-}
-
-__code get_stub(struct Context* context) {
-    goto get(context, &context->data[Allocate]->allocate, &context->data[Queue]->queue, &context->data[context->dataNum]->element);
-}
-
-__code thread_exit(struct Context* context) {
-    free(context->code);
-    free(context->data);
-    free(context->heapStart);
-    pthread_exit(0);
-}
-
-__code thread_exit_stub(struct Context* context) {
-    goto thread_exit(context);
-}
-
-void* thread_func(void* context) {
-    goto start_code((struct Context*)context, Code1);
-    return 0;
-}
-
-void* thread_func2(void* context) {
-    goto start_code((struct Context*)context, Code5);
-    return 0;
-}
-
-int main() {
-    struct Context* context1 = (struct Context*)malloc(sizeof(struct Context));
-    initSynchronizedQueueContext(context1);
-    struct Context* context2 = (struct Context*)malloc(sizeof(struct Context));
-    initSynchronizedQueueContext(context2);
-    struct Context* context3 = (struct Context*)malloc(sizeof(struct Context));
-    initSynchronizedQueueContext(context3);
-    struct Context* context4 = (struct Context*)malloc(sizeof(struct Context));
-    initSynchronizedQueueContext(context4);
-    context2->data[Queue] = context1->data[Queue];
-    context3->data[Queue] = context1->data[Queue];
-    context4->data[Queue] = context1->data[Queue];
-    pthread_t thread1, thread2, thread3, thread4;
-    pthread_create(&thread1, NULL, thread_func, (void *)context1);
-    pthread_create(&thread2, NULL, thread_func, (void *)context2);
-    pthread_create(&thread3, NULL, thread_func2, (void *)context3);
-    pthread_create(&thread4, NULL, thread_func2, (void *)context4);
-    pthread_join(thread1, NULL);
-    pthread_join(thread2, NULL);
-    pthread_join(thread3, NULL);
-    pthread_join(thread4, NULL);
-}
--- a/meta_connector/meta_connector.py	Mon Nov 02 04:17:33 2015 +0900
+++ b/meta_connector/meta_connector.py	Tue Nov 03 18:17:48 2015 +0900
@@ -10,7 +10,7 @@
     parser = argparse.ArgumentParser(
     formatter_class=argparse.RawDescriptionHelpFormatter,
     description="""\
-Parse meta connect syntax and create stub. Default output is stdout.
+Parse meta connect syntax and create stub. Default output is {input file name}Connected.
 
 sample)
 __code code0(struct Data data1, ...){
@@ -29,6 +29,10 @@
                         type=str,\
                         metavar='<file>',\
                         help='write output to <file>')
+    parser.add_argument('--stdout',\
+                        action='store_true',\
+                        default=False,\
+                        help='output to stdout')
                         
     return parser.parse_args()
 
@@ -129,15 +133,24 @@
 def main():
     args = get_args()
     output = sys.stdout
+
     try:
         f = open(args.input_file,'r')
     except IOError:
-        print("cannot open file %s" % input_file)
+        sys.exit("Error: cannot open file %s" % args.input_file)
+
+    if not args.stdout:
+        try:
+            filename = args.input_file.split('.')[0]+'Connected.c'
+            output = open(filename,'w')
+        except IOError:
+            sys.exit("Error: cannot open file %s" % filename)
+
     if args.output is not None:
         try:
             output = open(args.output[0],'w')
         except IOError:
             print("cannot open file %s" % args.output)
     lines = f.readlines()
-    connect_list = parse_meta_syntax(lines, output)
+    parse_meta_syntax(lines, output)
 main()