Mercurial > hg > Game > Cerium
changeset 1869:5e06a8089625 draft
merge
| author | Masataka Kohagura <e085726@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 26 Dec 2013 15:33:06 +0900 |
| parents | 14225fec047c (current diff) 7706faa6b0c9 (diff) |
| children | 44fa0f1320a9 |
| files | example/fileread/main.cc |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/example/fileread/main.cc Thu Dec 26 15:30:15 2013 +0900 +++ b/example/fileread/main.cc Thu Dec 26 15:33:06 2013 +0900 @@ -52,8 +52,11 @@ read->set_param(2,(long)fr->division_size); } read->set_param(3,(long)fr->fd); //fdの番号の受け渡し +<<<<<<< local read->set_outData(0,read_text + fr->task_number*fr->division_size, fr->division_size); +======= +>>>>>>> other fr->t_print->wait_for(read); read->spawn(); @@ -63,7 +66,11 @@ } if (fr->left_size > 0) { +<<<<<<< local HTaskPtr next = manager->create_task(RUN_BLOCKS, (memaddr)&fr->self, sizeof(memaddr),read_text,fr->filesize); +======= + HTaskPtr next = manager->create_task(RUN_BLOCKS, (memaddr)&fr->self, sizeof(memaddr),0,0); +>>>>>>> other fr->t_print->wait_for(next); next->wait_for(wait); next->spawn();