--enable-perf-tracking --enable-profile doesn't compile

[pdbj]

Configuring with --enable-perf-tracking --enable-profile doesn't compile, because some member variables and functions are only enabled with __SST_DEBUG_EVENT_TRACKING

Patch here

[pdbj]

Revised Fix conditional code with --enable-perf-tracking --enable-profile

[jleidel]

@pdbj, is your tree up to date? The revised patch appears to be stale.

[pdbj]

Rebased Fix conditional code with --enable-perf-tracking --enable-profile

[pdbj]

I’ve rebased my wip branch and revised all the links on GitHub.

Peter

On May 9, 2022, at 2:07 PM, jleidel @.@.>> wrote:

@pdbjhttps://urldefense.us/v3/__https://github.com/pdbj__;!!G2kpM7uM-TzIFchu!jOsk18GC3BBLOJjSOgifzESom-A_Cj8wlbKouXsvLV4UAWYxko9rmPAFGdIEcqox$, is your tree up to date? The revised patch appears to be stale.

— Reply to this email directly, view it on GitHubhttps://urldefense.us/v3/__https://github.com/sstsimulator/sst-core/issues/806*issuecomment-1121581394__;Iw!!G2kpM7uM-TzIFchu!jOsk18GC3BBLOJjSOgifzESom-A_Cj8wlbKouXsvLV4UAWYxko9rmPAFGdQW1UIj$, or unsubscribehttps://urldefense.us/v3/__https://github.com/notifications/unsubscribe-auth/AABQ6XMOJUPDZS3DUDMSJLLVJF473ANCNFSM5QQLWEPQ__;!!G2kpM7uM-TzIFchu!jOsk18GC3BBLOJjSOgifzESom-A_Cj8wlbKouXsvLV4UAWYxko9rmPAFGci6LckA$. You are receiving this because you were mentioned.Message ID: @.***>

---

Dr. Peter D. Barnes, Jr. CASC Division, B451 R2035 Lawrence Livermore National Laboratory Computation Directorate 7000 East Avenue, L-561 email: @.@.> P. O. Box 808 Voice: (925) 422-3384 Livermore, California 94550

[jleidel]

It appears your WIP branch is tracking master, not devel. In the future, I would suggest tracking devel such that these patches can be merged. As it stands, we'll need to manually merge the changes into devel.

[pdbj]

[edit to trim email cruft]

Yes, I’m tracking master.

According to Github devel is 165 commits behind master. Should I really track devel?

[jleidel]

@pdbj yes you should be tracking devel. All PRs targeting bug fixes and new features must target devel. See: https://github.com/sstsimulator/sst-core/blob/master/CONTRIBUTING.md

[feldergast]

[edit to trim email cruft] Yes, I’m tracking master. According to Github devel is 165 commits behind master. Should I really track devel?

Devel is never truly "behind" master. Everything goes into devel first, then is merged into master through a pull request. The 165 commits behind master is likely an artifact of the merge commits from devel into master being only in the master branch. It would have been nice if we could just do a rebase and merge from devel to master, but that wasn't an option when we started requiring PRs from devel to master.

I would consider master to be "read-only". If you want to add any code to SST, I would definitely use the devel branch.

[jleidel]

@pdbj Is there more than one commit that needs to be merged from this tree? (Similar to Issue #808)

[berquist]

This was fixed by #861.