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.

Sign up for GitHub

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

Jump to bottom

Merge in Paul's threading branch (renamed to second_idea #1

Merged
merged 37 commits into from
Apr 12, 2018
Merged

Merge in Paul's threading branch (renamed to second_idea #1

merged 37 commits into from
Apr 12, 2018

Commits on Jan 18, 2018

  1. Initial commit, work in progress. 

    Overall, moving towards task-based system rather than event-based.
Also, a system where factories/plugins themselves can submit multi-threaded
tasks.
    @pmattjlab
    pmattjlab committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    dd672f8 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. Still work in progress.

    @pmattjlab
    pmattjlab committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    88477e2 View commit details
    Browse the repository at this point in the history

  2. Work in progress.

    @pmattjlab
    pmattjlab committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    a373243 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. More changes.

    @pmattjlab
    pmattjlab committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    815766e View commit details
    Browse the repository at this point in the history

  2. Significant progress.

    @pmattjlab
    pmattjlab committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    95277f2 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. About to try compiling.

    @pmattjlab
    pmattjlab committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    2c54813 View commit details
    Browse the repository at this point in the history

  2. Close to compiling. Fix plugin next.

    @pmattjlab
    pmattjlab committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    3ab85a6 View commit details
    Browse the repository at this point in the history

  3. Not perfect, but everything compiles again.

    @pmattjlab
    pmattjlab committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    f49b6c5 View commit details
    Browse the repository at this point in the history

  4. Runs, has memory issues.

    @pmattjlab
    pmattjlab committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    5b81b58 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. Resource pool overhauled.

    @pmattjlab
    pmattjlab committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    7f850af View commit details
    Browse the repository at this point in the history

  2. Appears to be working?

    @pmattjlab
    pmattjlab committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    2228351 View commit details
    Browse the repository at this point in the history

  3. Rearrange to make more readable.

    @pmattjlab
    pmattjlab committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    a123043 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2018

  1. Implementing factories, work in progress.

    @pmattjlab
    pmattjlab committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    3cc31ed View commit details
    Browse the repository at this point in the history

  2. Compiles!

    @pmattjlab
    pmattjlab committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    1d5e862 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2018

  1. Compiles again, seg faults and core dumps.

    @pmattjlab
    pmattjlab committed Feb 1, 2018
    Configuration menu
    Copy the full SHA
    a8e392c View commit details
    Browse the repository at this point in the history

  2. Debugging.

    @pmattjlab
    pmattjlab committed Feb 1, 2018
    Configuration menu
    Copy the full SHA
    2463005 View commit details
    Browse the repository at this point in the history

  3. Running, has logger.

    @pmattjlab
    pmattjlab committed Feb 1, 2018
    Configuration menu
    Copy the full SHA
    a3b559a View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2018

  1. Testing submitting subtasks, not working yet.

    @pmattjlab
    pmattjlab committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    a0f51e3 View commit details
    Browse the repository at this point in the history

  2. Debugging.

    @pmattjlab
    pmattjlab committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    f18594c View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2018

  1. Bug fixing.

    @pmattjlab
    pmattjlab committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    d4173e1 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2018

  1. Tweaks for compiling on Mac OS X

    @faustus123
    faustus123 committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    afeec5d View commit details
    Browse the repository at this point in the history

  2. Tweak

    @pmattjlab
    pmattjlab committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    adfc547 View commit details
    Browse the repository at this point in the history

  3. Trying to get barrier events to work.

    @pmattjlab
    pmattjlab committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    4acd9b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2018

  1. Barriers implemented.

    @pmattjlab
    pmattjlab committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    921ae32 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2018

  1. Merge branch 'threading' of https://github.com/JeffersonLab/JANA into… 

    … threading
    @pmattjlab
    pmattjlab committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    1c714da View commit details
    Browse the repository at this point in the history

  2. Barrier queue, not tested.

    @pmattjlab
    pmattjlab committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    25ef12b View commit details
    Browse the repository at this point in the history

  3. More comments.

    @pmattjlab
    pmattjlab committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    3b25229 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2018

  1. Print report on seg fault 

    Add/remove threads when desired.
Get 'N' events from source at once, not just 1.
    @pmattjlab
    pmattjlab committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    39c5ad5 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2018

  1. Tried (and failed) to get stack trace for current thread.

    @pmattjlab
    pmattjlab committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    f3486d6 View commit details
    Browse the repository at this point in the history

  2. Use JParameters for configurable things.

    @pmattjlab
    pmattjlab committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    5fee2d6 View commit details
    Browse the repository at this point in the history

  3. Apparently, setting some defaults for parameters segfaults. 

    Probably if setting the default more than once.
    @pmattjlab
    pmattjlab committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    85b15da View commit details
    Browse the repository at this point in the history

  4. Try using JQueueWithLock instead of JQueue.

    @pmattjlab
    pmattjlab committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    7bde205 View commit details
    Browse the repository at this point in the history

  5. Fix include

    @pmattjlab
    pmattjlab committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    fc3b317 View commit details
    Browse the repository at this point in the history

  6. Fix include

    GlueX-Hall-D (Mark Ito) committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    461c4b0 View commit details
    Browse the repository at this point in the history

  7. Fix bug

    @pmattjlab
    pmattjlab committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    01c972f View commit details
    Browse the repository at this point in the history

  8. Try to get barriers working

    @pmattjlab
    pmattjlab committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    6bdd7d6 View commit details
    Browse the repository at this point in the history

  9. Barriers working.

    @pmattjlab
    pmattjlab committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    6405fe8 View commit details
    Browse the repository at this point in the history