comparison AnimationMaster.c @ 290:c63b498d0a00

Fixed post-merge issues -- renames and includes..
author Sean Halle <seanhalle@yahoo.com>
date Thu, 05 Sep 2013 18:49:48 -0700
parents 744b5ff9851e
children
comparison
equal deleted inserted replaced
24:33358c4d2a55 25:3bdb2f9d3f9d
314 // 314 //
315 task = 315 task =
316 (*req->createHdlr)(req->langReq, slave, PR_int__give_lang_env(protoLangEnv) ); 316 (*req->createHdlr)(req->langReq, slave, PR_int__give_lang_env(protoLangEnv) );
317 protoMetaTask = PR_int__give_prolog_of_lang_meta_task( task ); 317 protoMetaTask = PR_int__give_prolog_of_lang_meta_task( task );
318 protoMetaTask->ID = req->ID; //may be NULL 318 protoMetaTask->ID = req->ID; //may be NULL
319 protoMetaTask->topLevelFn = req->topLevelFn; 319 protoMetaTask->topLevelFn = req->birthFnPtr;
320 protoMetaTask->initData = req->initData; 320 protoMetaTask->initData = req->initData;
321 protoMetaTask->processTaskIsIn = process; 321 protoMetaTask->processTaskIsIn = process;
322 322
323 process->numLiveTasks += 1; 323 process->numLiveTasks += 1;
324 protoLangEnv->numLiveWork += 1; //used in wait statements -- small added overhead 324 protoLangEnv->numLiveWork += 1; //used in wait statements -- small added overhead