Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor cleanups, remove Engine::getParametersManager() #231

Merged
merged 10 commits into from
Oct 26, 2017

Conversation

rdumusc
Copy link

@rdumusc rdumusc commented Oct 20, 2017

No description provided.

createEngine();

#if (BRAYNS_USE_DEFLECT || BRAYNS_USE_NETWORKING)
// after createEngine() to execue in parallel to scene loading
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo 'execue'

_parametersManager->getRenderingParameters().getEngine();
_engine = _engineFactory->get(engineName);
_parametersManager.getRenderingParameters().getEngine();
_engine = _engineFactory.create(engineName);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would still _engine.reset() explicitly, otherwise two engines are active until the assignment to the unique_ptr is done

delete[] argv;
return _engines[name];
}
return make_unique<OSPRayEngine>(_argc, _argv, _parametersManager);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iirc, the reason for the copy of argv is that engines might mutate it, aka if the engine is not taking a const char*. Please check that, or we have a look together.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that only the LivreEngine had a constness problem, but it is already making a copy of the args internally... I seriously hope that no engine actually alters the CL parameters though!

Copy link
Contributor

@tribal-tec tribal-tec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+2

Copy link
Contributor

@tribal-tec tribal-tec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hold on! ospray removes args from argv, so at least there we also need a copy it seems

@rdumusc
Copy link
Author

rdumusc commented Oct 25, 2017

argggggg!!

@timocafe
Copy link
Contributor

timocafe commented Oct 25, 2017 via email

@rdumusc rdumusc merged commit b3abe53 into BlueBrain:rockets Oct 26, 2017
@rdumusc rdumusc deleted the rockets branch October 26, 2017 12:47
@rdumusc rdumusc restored the rockets branch October 26, 2017 12:47
@rdumusc rdumusc deleted the rockets branch October 26, 2017 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants