Merge branch 'dyninst_proccontrol' into pc_bgq
authorlegendre1 <legendre1@auk60.llnl.gov>
Thu, 7 Jun 2012 22:57:19 +0000 (15:57 -0700)
committerlegendre1 <legendre1@auk60.llnl.gov>
Thu, 7 Jun 2012 22:57:19 +0000 (15:57 -0700)
commit5dbd5027c38157151661ece5c2a244e85db98e8a
treee6b50dc2eb3ebcd5acca1544dd00016792601a00
parentda15a0fd5332bbbc84f65814b9d69d12f1d038d9
parent0fd0bf03736705cb5bbf08de989f1df560053d20
Merge branch 'dyninst_proccontrol' into pc_bgq

Conflicts:
proccontrol/h/PCErrors.h
proccontrol/h/Process.h
proccontrol/h/ProcessSet.h
proccontrol/ppc64_bgq_ion/Makefile
proccontrol/src/bluegeneq.C
proccontrol/src/int_process.h
proccontrol/src/linux.C
proccontrol/src/process.C
proccontrol/src/procset.C
proccontrol/src/response.h
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.mutators.gen
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/tuples
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen
testsuite/ppc32_bgp_ion/tuples
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_bgq_ion/Makefile
testsuite/ppc64_bgq_ion/make.mutators.gen
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen
testsuite/ppc64_bgq_ion/test_info_new.gen.C
testsuite/ppc64_bgq_ion/tuples
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/src/dynlmon.C
testsuite/src/proccontrol/pc_groups_mutatee.c
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/testdriver_be.C
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples
testsuite/x86_64_cnl/make.mutators.gen
testsuite/x86_64_cnl/make.solo_mutatee.gen
testsuite/x86_64_cnl/tuples
70 files changed:
common/ppc64_bgq_ion/Makefile
common/src/serialize-bin.C
make.config
proccontrol/h/Handler.h
proccontrol/h/PCErrors.h
proccontrol/h/Process.h
proccontrol/h/ProcessSet.h
proccontrol/make.module.tmpl
proccontrol/src/bluegeneq.C
proccontrol/src/bluegeneq.h
proccontrol/src/event.C
proccontrol/src/handler.C
proccontrol/src/int_event.h
proccontrol/src/int_process.h
proccontrol/src/linux.C
proccontrol/src/linux.h
proccontrol/src/pcerrors.C
proccontrol/src/process.C
proccontrol/src/procset.C
proccontrol/src/response.C
proccontrol/src/response.h
stackwalk/h/frame.h
stackwalk/h/walker.h
stackwalk/src/framestepper.C
testsuite/amd64-unknown-freebsd7.2/make.mutators.gen
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.mutators.gen
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.mutators.gen
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/nmake.mutators.gen
testsuite/i386-unknown-nt4.0/nmake.solo_mutatee.gen
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/ppc32_bgp/make.mutators.gen
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/tuples
testsuite/ppc32_bgp_ion/make.mutators.gen
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen
testsuite/ppc32_bgp_ion/tuples
testsuite/ppc32_linux/make.mutators.gen
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_bgq_ion/make.mutators.gen
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen
testsuite/ppc64_bgq_ion/tuples
testsuite/ppc64_linux/make.mutators.gen
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/tuples
testsuite/src/connection.C
testsuite/src/proccontrol/pc_groups_mutatee.c
testsuite/src/proccontrol/pc_stat.C
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/proccontrol/proccontrol_comp.h
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_lib.C
testsuite/src/testdriver_be.C
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
testsuite/x86_64_cnl/make.mutators.gen
testsuite/x86_64_cnl/make.solo_mutatee.gen
testsuite/x86_64_cnl/test_info_new.gen.C
testsuite/x86_64_cnl/tuples