Mercurial > hg > Gears > Gears
changeset 960:fe4e0a562aa3
remove WcImpl.c
author | ichikitakahiro <e165713@ie.u-ryukyu.ac.jp> |
---|---|
date | Wed, 17 Mar 2021 18:06:57 +0900 |
parents | 591749f07e7b |
children | 359f22dec55b |
files | src/parallel_execution/CMakeLists.txt src/parallel_execution/examples/wc/WcImpl.c src/parallel_execution/examples/wc/WcImpl.cbc src/parallel_execution/examples/wc/WcImpl.h src/parallel_execution/examples/wc/main.cbc src/parallel_execution/lib/Gears/Context.pm |
diffstat | 6 files changed, 8 insertions(+), 72 deletions(-) [+] |
line wrap: on
line diff
--- a/src/parallel_execution/CMakeLists.txt Wed Mar 17 16:07:07 2021 +0900 +++ b/src/parallel_execution/CMakeLists.txt Wed Mar 17 18:06:57 2021 +0900 @@ -170,6 +170,6 @@ TARGET wc SOURCES - TaskManagerImpl.cbc CPUWorker.cbc SynchronizedQueue.cbc AtomicReference.cbc SingleLinkedStack.cbc examples/wc/main.cbc examples/wc/WcImpl.c + TaskManagerImpl.cbc CPUWorker.cbc SynchronizedQueue.cbc AtomicReference.cbc SingleLinkedStack.cbc examples/wc/main.cbc examples/wc/WcImpl.cbc )
--- a/src/parallel_execution/examples/wc/WcImpl.c Wed Mar 17 16:07:07 2021 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -#include "../../context.h" -#include <stdio.h> -// include "WcResult.h" - -// ---- -// typedef struct WcImpl <> impl Wc { -// char* Keyword; -// int wordNum; -// } WcImpl; -// ---- - -Wc* createWcImpl(struct Context* context, char* filename) { - struct Wc* wc = &ALLOCATE(context, Wc)->Wc; - struct WcImpl* wc_impl = &ALLOCATE(context, WcImpl)->WcImpl; - wc->wc = (union Data*)wc_impl; - wc_impl->filename = filename; - wc->result = NULL; - wc_impl->Keyword = NULL; - wc_impl->wordNum = 0; - wc->openFile = C_openFileWcImpl; - wc->countUp = C_countUpWcImpl; - return wc; -} -__code openFileWcImpl(struct Context *context,struct WcImpl* wc, enum Code next) { - FILE* file = fopen(wc->filename, "r"); - if (file == NULL){ - printf("ファイルが開ませんでした\n"); - exit(1); - } else { - printf("file open"); - } - - goto meta(context, C_countUpWcImpl); -} - -__code openFileWcImpl_stub(struct Context* context) { - WcImpl* wc = (WcImpl*)GearImpl(context, Wc, wc); - enum Code next = Gearef(context, Wc)->next; - goto openFileWcImpl(context, wc, next); -} - -__code countUpWcImpl(struct Context *context,struct WcImpl* wc,enum Code next, WcResult **O_result) { - /* - Read data from file - if eof - setup result - *O_result = WcResult* result; - goto meta(context, next); - - befor if eof - Count new line - Count word - Count char - TODO - */ - goto meta(context, C_countUpWcImpl); -} - -__code countUpWcImpl_stub(struct Context* context) { - WcImpl* wc = (WcImpl*)GearImpl(context, Wc, wc); - enum Code next = Gearef(context, Wc)->next; - WcResult** O_result = &Gearef(context, Wc)->result; - goto countUpWcImpl(context, wc, next, O_result); -} -
--- a/src/parallel_execution/examples/wc/WcImpl.cbc Wed Mar 17 16:07:07 2021 +0900 +++ b/src/parallel_execution/examples/wc/WcImpl.cbc Wed Mar 17 18:06:57 2021 +0900 @@ -29,8 +29,8 @@ } else { printf("file open"); } - - goto countUp(wc); + wc->file = (union Data*)file; + goto countUp(wc, next); } __code countUp(struct WcImpl* wc,__code next(WcResult* result, ...)) {
--- a/src/parallel_execution/examples/wc/WcImpl.h Wed Mar 17 16:07:07 2021 +0900 +++ b/src/parallel_execution/examples/wc/WcImpl.h Wed Mar 17 18:06:57 2021 +0900 @@ -2,4 +2,5 @@ char* Keyword; int wordNum; char* filename; + union Data* file; } WcImpl;
--- a/src/parallel_execution/examples/wc/main.cbc Wed Mar 17 16:07:07 2021 +0900 +++ b/src/parallel_execution/examples/wc/main.cbc Wed Mar 17 18:06:57 2021 +0900 @@ -41,7 +41,7 @@ __code createTask1(struct LoopCounter* loopCounter, struct TaskManager* taskManager) { Wc* wc = createWcImpl(context, target.filename); - goto wc->openFile(wc->countUp); + goto wc->openFile(code2); }
--- a/src/parallel_execution/lib/Gears/Context.pm Wed Mar 17 16:07:07 2021 +0900 +++ b/src/parallel_execution/lib/Gears/Context.pm Wed Mar 17 18:06:57 2021 +0900 @@ -289,9 +289,9 @@ $counter{interfaces}->{Meta}++; $counter{interfaces}->{TaskManager}++; - print "-----------\n"; - print Dumper \%counter; #this line is debug message - print "-----------\n"; + #print "-----------\n"; + #print Dumper \%counter; #this line is debug message + #print "-----------\n"; return \%counter; }