Opened 5 years ago

Closed 4 years ago

#1293 closed help (answered)

xxdiff crashing on puma during dcm conflicts

Reported by: pclark Owned by: ros
Component: FCM Keywords: xxdiff
Cc: Platform: PUMA
UM Version: 8.3

Description

I'm attempting to upgrade a branch from 8.2 to 8.3. Having checked out a new 8.3 branch and merged in the 8.2 branch, as normal, I run fcm conflicts. The first file opens up, and I go to the first conflict. Pressing s to split the conflict crashes xxdiff, with the following traceback:

[info] src/control/top_level/check_idealise_4A.F90: in text conflict.
*** glibc detected *** xxdiff: malloc(): memory corruption (fast): 0x0816cda0 ***
======= Backtrace: =========
/lib/libc.so.6[0xf6c4f7a4]
/lib/libc.so.6[0xf6c522fc]
/lib/libc.so.6(__libc_malloc+0x9c)[0xf6c539dc]
/usr/lib/libstdc++.so.6(_Znwj+0x27)[0xf6e33557]
/usr/lib/libqt-mt.so.3(_ZN4QPen4initERK6QColorjj+0x2c)[0xf727203c]
/usr/lib/libqt-mt.so.3(_ZN4QPenC1Ev+0x39)[0xf7272579]
/usr/lib/libqt-mt.so.3(_ZN8QPainterC1EPK12QPaintDeviceb+0x4d)[0xf7275ded]
/usr/lib/libqt-mt.so.3(_ZNK9QSGIStyle13drawPrimitiveEN6QStyle16PrimitiveElementEP8QPainterRK5QRectRK11QColorGroupjRK12QStyleOption+0x1a9)[0xf75b4d99]
/usr/lib/libqt-mt.so.3(_ZNK9QSGIStyle18drawComplexControlEN6QStyle14ComplexControlEP8QPainterPK7QWidgetRK5QRectRK11QColorGroupjjjRK12QStyleOption+0x3d8)[0xf75b1e48]
/usr/lib/libqt-mt.so.3(_ZNK10QScrollBar12drawControlsEjjP8QPainter+0xd7)[0xf73851b7]
/usr/lib/libqt-mt.so.3(_ZNK10QScrollBar12drawControlsEjj+0x57)[0xf7385237]
/usr/lib/libqt-mt.so.3(_ZN10QScrollBar11rangeChangeEv+0x42)[0xf7385882]
/usr/lib/libqt-mt.so.3(_ZN13QRangeControl8setRangeEii+0x50)[0xf7384b90]
xxdiff[0x807fa51]
xxdiff[0x807f4d1]
xxdiff[0x80c8295]
xxdiff[0x80c8630]
/usr/lib/libqt-mt.so.3(_ZN7QObject15activate_signalEP15QConnectionListP8QUObject+0xed)[0xf726ba7d]
/usr/lib/libqt-mt.so.3(_ZN7QObject15activate_signalEi+0x9b)[0xf726e03b]
xxdiff[0x80c6ea0]
xxdiff[0x80c667f]
/usr/lib/libqt-mt.so.3(_ZN7QObject15activate_signalEP15QConnectionListP8QUObject+0x16a)[0xf726bafa]
/usr/lib/libqt-mt.so.3(_ZN7QObject15activate_signalEi+0x9b)[0xf726e03b]
xxdiff[0x80c72a0]
xxdiff[0x809c511]
xxdiff[0x805ac17]
xxdiff[0x80c6a81]
/usr/lib/libqt-mt.so.3(_ZN7QObject15activate_signalEP15QConnectionListP8QUObject+0x16a)[0xf726bafa]
/usr/lib/libqt-mt.so.3(_ZN7QSignal6signalERK8QVariant+0x8e)[0xf75cef5e]
/usr/lib/libqt-mt.so.3(_ZN7QSignal8activateEv+0x7d)[0xf7288a6d]
/usr/lib/libqt-mt.so.3(_ZN10QPopupMenu14accelActivatedEi+0xad)[0xf737b95d]
/usr/lib/libqt-mt.so.3(_ZN10QPopupMenu9qt_invokeEiP8QUObject+0xcd)[0xf75e57ed]
/usr/lib/libqt-mt.so.3(_ZN7QObject15activate_signalEP15QConnectionListP8QUObject+0x16a)[0xf726bafa]
/usr/lib/libqt-mt.so.3(_ZN7QObject15activate_signalEii+0xd9)[0xf726def9]
/usr/lib/libqt-mt.so.3(_ZN6QAccel9activatedEi+0x30)[0xf75c7350]
/usr/lib/libqt-mt.so.3(_ZN13QAccelPrivate8activateEP10QAccelItem+0x8c)[0xf7203f5c]
/usr/lib/libqt-mt.so.3(_ZN13QAccelManager18dispatchAccelEventEP7QWidgetP9QKeyEvent+0x474)[0xf7204de4]
/usr/lib/libqt-mt.so.3(_Z21qt_dispatchAccelEventP7QWidgetP9QKeyEvent+0x3c)[0xf720554c]
/usr/lib/libqt-mt.so.3(_ZN12QApplication6notifyEP7QObjectP6QEvent+0xbf)[0xf720772f]
/usr/lib/libqt-mt.so.3(_ZN13QAccelManager13tryAccelEventEP7QWidgetP9QKeyEvent+0x5b)[0xf72039db]
/usr/lib/libqt-mt.so.3(_Z16qt_tryAccelEventP7QWidgetP9QKeyEvent+0x3c)[0xf72055dc]
/usr/lib/libqt-mt.so.3(_ZN9QETWidget17translateKeyEventEPK7_XEventb+0x543)[0xf7194703]
/usr/lib/libqt-mt.so.3(_ZN12QApplication15x11ProcessEventEP7_XEvent+0x69f)[0xf719c11f]
/usr/lib/libqt-mt.so.3(_ZN10QEventLoop13processEventsEj+0x254)[0xf71b0de4]
/usr/lib/libqt-mt.so.3(_ZN10QEventLoop9enterLoopEv+0x50)[0xf721f090]
/usr/lib/libqt-mt.so.3(_ZN10QEventLoop4execEv+0x26)[0xf721ef26]
/usr/lib/libqt-mt.so.3(_ZN12QApplication4execEv+0x1f)[0xf7206dbf]
xxdiff[0x8078da4]
/lib/libc.so.6(__libc_start_main+0xe5)[0xf6bf9705]
xxdiff(_ZNK7QDialog8sizeHintEv+0x115)[0x8056851]
======= Memory map: ========
08048000-080fe000 r-xp 00000000 08:12 321055                             /usr/local/bin/xxdiff
080fe000-080ff000 r--p 000b5000 08:12 321055                             /usr/local/bin/xxdiff
080ff000-08112000 rw-p 000b6000 08:12 321055                             /usr/local/bin/xxdiff
08112000-0820c000 rw-p 08112000 00:00 0                                  [heap]
f6700000-f6721000 rw-p f6700000 00:00 0 
f6721000-f6800000 ---p f6721000 00:00 0 
f688b000-f68a5000 r--p 00000000 08:12 355838                             /usr/share/fonts/truetype/andalemo.ttf
f68a5000-f68dc000 r--p 00000000 08:12 355846                             /usr/share/fonts/truetype/arialbi.ttf
f68dc000-f6920000 r--p 00000000 08:12 355847                             /usr/share/fonts/truetype/arial.ttf
f6920000-f6927000 r--s 00000000 08:12 329577                             /var/cache/fontconfig/77e41c5059666d75f92e318d4be8c21e-x86.cache-2
f6927000-f692c000 r--s 00000000 08:12 329578                             /var/cache/fontconfig/1890317d8a3fded7854d26fdd2e67c05-x86.cache-2
f692c000-f696c000 r--s 00000000 08:12 329440                             /var/cache/fontconfig/df311e82a1a24c41a75c2c930223552e-x86.cache-2
f696c000-f6971000 r--s 00000000 08:12 329443                             /var/cache/fontconfig/d62e99ef547d1d24cdb1bd22ec1a2976-x86.cache-2
f6971000-f69b1000 r--s 00000000 08:12 329441                             /var/cache/fontconfig/17090aa38d5c6f09fb8c5c354938f1d7-x86.cache-2
f69b1000-f69d3000 r--s 00000000 08:12 329618                             /var/cache/fontconfig/8d4af663993b81a124ee82e610bb31f9-x86.cache-2
f69d3000-f69f6000 r--s 00000000 08:12 329541                             /var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-x86.cache-2
f69f6000-f6a2b000 r--s 00000000 08:12 329481                             /var/run/nscd/db07maZG (deleted)
f6a2b000-f6a2d000 rw-p f6a2b000 00:00 0 
f6a2d000-f6a31000 r-xp 00000000 08:12 271288                             /lib/libuuid.so.1.2
f6a31000-f6a32000 r--p 00003000 08:12 271288                             /lib/libuuid.so.1.2
f6a32000-f6a33000 rw-p 00004000 08:12 271288                             /lib/libuuid.so.1.2
f6a33000-f6a34000 rw-p f6a33000 00:00 0 
f6a34000-f6a59000 r-xp 00000000 08:12 271300                             /lib/libexpat.so.1.5.2
f6a59000-f6a5b000 r--p 00024000 08:12 271300                             /lib/libexpat.so.1.5.2
f6a5b000-f6a5c000 rw-p 00026000 08:12 271300                             /lib/libexpat.so.1.5.2
f6a5c000-f6a60000 r-xp 00000000 08:12 52036                              /usr/lib/libXfixes.so.3.1.0
f6a60000-f6a61000 r--p 00003000 08:12 52036                              /usr/lib/libXfixes.so.3.1.0
f6a61000-f6a62000 rw-p 00004000 08:12 52036                              /usr/lib/libXfixes.so.3.1.0
f6a62000-f6a7e000 r-xp 00000000 08:12 51931                              /usr/lib/libxcb.so.1.0.0
f6a7e000-f6a7f000 r--p 0001b000 08:12 51931                              /usr/lib/libxcb.so.1.0.0
f6a7f000-f6a80000 rw-p 0001c000 08:12 51931                              /usr/lib/libxcb.so.1.0.0
f6a80000-f6a81000 r-xp 00000000 08:12 51921                              /usr/lib/libxcb-xlib.so.0.0.0
f6a81000-f6a82000 r--p 00000000 08:12 51921                              /usr/lib/libxcb-xlib.so.0.0.0
f6a82000-f6a83000 rw-p 00001000 08:12 51921                              /usr/lib/libxcb-xlib.so.0.0.0
f6a83000-f6a85000 r-xp 00000000 08:12 51879                              /usr/lib/libXau.so.6.0.0
f6a85000-f6a86000 r--p 00001000 08:12 51879                              /usr/lib/libXau.so.6.0.0
f6a86000-f6a87000 rw-p 00002000 08:12 51879                              /usr/lib/libXau.so.6.0.0
f6a87000-f6a88000 rw-p f6a87000 00:00 0 
f6a88000-f6a8b000 r-xp 00000000 08:12 271154                             /lib/libdl-2.9.so
f6a8b000-f6a8c000 r--p 00002000 08:12 271154                             /lib/libdl-2.9.so
f6a8c000-f6a8d000 rw-p 00003000 08:12 271154                             /lib/libdl-2.9.so
f6a8d000-f6aa4000 r-xp 00000000 08:12 51873                              /usr/lib/libICE.so.6.3.0
f6aa4000-f6aa5000 r--p 00016000 08:12 51873                              /usr/lib/libICE.so.6.3.0
f6aa5000-f6aa6000 rw-p 00017000 08:12 51873                              /usr/lib/libICE.so.6.3.0
f6aa6000-f6aa8000 rw-p f6aa6000 00:00 0 
f6aa8000-f6aaf000 r-xp 00000000 08:12 51992                              /usr/lib/libSM.so.6.0.0
f6aaf000-f6ab0000 r--p 00006000 08:12 51992                              /usr/lib/libSM.so.6.0.0
f6ab0000-f6ab1000 rw-p 00007000 08:12 51992                              /usr/lib/libSM.so.6.0.0
f6ab1000-f6ae0000 r-xp 00000000 08:12 52008                              /usr/lib/libfontconfig.so.1.3.0
f6ae0000-f6ae1000 r--p 0002e000 08:12 52008                              /usr/lib/libfontconfig.so.1.3.0
f6ae1000-f6ae2000 rw-p 0002f000 08:12 52008                              /usr/lib/libfontconfig.so.1.3.0
f6ae2000-f6b5d000 r-xp 00000000 08:12 51978                              /usr/lib/libfreetype.so.6.3.18
f6b5d000-f6b61000 r--p 0007a000 08:12 51978                              /usr/lib/libfreetype.so.6.3.18
f6b61000-f6b62000 rw-p 0007e000 08:12 51978                              /usr/lib/libfreetype.so.6.3.18
f6b62000-f6b63000 rw-p f6b62000 00:00 0 
f6b63000-f6b76000 r-xp 00000000 08:12 52152                              /usr/lib/libXft.so.2.1.13
f6b76000-f6b77000 r--p 00013000 08:12 52152                              /usr/lib/libXft.so.2.1.13
f6b77000-f6b78000 rw-p 00014000 08:12 52152                              /usr/lib/libXft.so.2.1.13
f6b78000-f6b7a000 r-xp 00000000 08:12 52156                              /usr/lib/libXinerama.so.1.0.0
f6b7a000-f6b7b000 r--p 00001000 08:12 52156                              /usr/lib/libXinerama.so.1.0.0
f6b7b000-f6b7c000 rw-p 00002000 08:12 52156                              /usr/lib/libXinerama.so.1.0.0
f6b7c000-f6b85000 r-xp 00000000 08:12 52140                              /usr/lib/libXcursor.so.1.0.2
f6b85000-f6b86000 r--p 00008000 08:12 52140                              /usr/lib/libXcursor.so.1.0.2
f6b86000-f6b87000 rw-p 00009000 08:12 52140                              /usr/lib/libXcursor.so.1.0.2
f6b87000-f6b8d000 r-xp 00000000 08:12 52160                              /usr/lib/libXrandr.so.2.1.0
f6b8d000-f6b8e000 r--p 00005000 08:12 52160                              /usr/lib/libXrandr.so.2.1.0
f6b8e000-f6b8f000 rw-p 00006000 08:12 52160                              /usr/lib/libXrandr.so.2.1.0
f6b8f000-f6b97000 r-xp 00000000 08:12 52025                              /usr/lib/libXrender.so.1.3.0
f6b97000-f6b98000 r--p 00007000 08:12 52025                              /usr/lib/libXrender.so.1.3.0
f6b98000-f6b99000 rw-p 00008000 08:12 52025                              /usr/lib/libXrender.so.1.3.0
f6b99000-f6ba1000 r-xp 00000000 08:12 52154                              /usr/lib/libXi.so.6.0.0
f6ba1000-f6ba2000 r--p 00007000 08:12 52154                              /usr/lib/libXi.so.6.0.0
f6ba2000-f6ba3000 rw-p 00008000 08:12 52154                              /usr/lib/libXi.so.6.0.0
f6ba3000-f6ba4000 rw-p f6ba3000 00:00 0 
f6ba4000-f6bb7000 r-xp 00000000 08:12 271296                             /lib/libz.so.1.2.3
f6bb7000-f6bb8000 r--p 00012000 08:12 271296                             /lib/libz.so.1.2.3
f6bb8000-f6bb9000 rw-p 00013000 08:12 271296                             /lib/libz.so.1.2.3
f6bb9000-f6be1000 r-xp 00000000 08:12 51983                              /usr/lib/libpng12.so.0.31.0
f6be1000-f6be2000 r--p 00027000 08:12 51983                              /usr/lib/libpng12.so.0.31.0
f6be2000-f6be3000 rw-p 00028000 08:12 51983                              /usr/lib/libpng12.so.0.31.0
f6be3000-f6d38000 r-xp 00000000 08:12 271151                             /lib/libc-2.9.so
f6d38000-f6d39000 ---p 00155000 08:12 271151                             /lib/libc-2.9.so
f6d39000-f6d3b000 r--p 00155000 08:12 271151                             /lib/libc-2.9.so
f6d3b000-f6d3c000 rw-p 00157000 08:12 271151                             /lib/libc-2.9.so
f6d3c000-f6d3f000 rw-p f6d3c000 00:00 0 
f6d3f000-f6d4c000 r-xp 00000000 08:12 271299                             /lib/libgcc_s.so.1
f6d4c000-f6d4d000 r--p 0000c000 08:12 271299                             /lib/libgcc_s.so.1
f6d4d000-f6d4e000 rw-p 0000d000 08:12 271299                             /lib/libgcc_s.so.1
f6d4e000-f6d75000 r-xp 00000000 08:12 271155                             /lib/libm-2.9.so
f6d75000-f6d76000 r--p 00026000 08:12 271155                             /lib/libm-2.9.so
f6d76000-f6d77000 rw-p 00027000 08:12 271155                             /lib/libm-2.9.so
f6d77000-f6e5f000 r-xp 00000000 08:12 51977                              /usr/lib/libstdc++.so.6.0.10
f6e5f000-f6e60000 ---p 000e8000 08:12 51977                              /usr/lib/libstdc++.so.6.0.10
f6e60000-f6e64000 r--p 000e8000 08:12 51977                              /usr/lib/libstdc++.so.6.0.10
f6e64000-f6e65000 rw-p 000ec000 08:12 51977                              /usr/lib/libstdc++.so.6.0.10
f6e65000-f6e6c000 rw-p f6e65000 00:00 0 
f6e6c000-f6e82000 r-xp 00000000 08:12 270985                             /lib/libpthread-2.9.so
f6e82000-f6e83000 r--p 00015000 08:12 270985                             /lib/libpthread-2.9.so
f6e83000-f6e84000 rw-p 00016000 08:12 270985                             /lib/libpthread-2.9.so
f6e84000-f6e86000 rw-p f6e84000 00:00 0 
f6e86000-f6fb5000 r-xp 00000000 08:12 52022                              /usr/lib/libX11.so.6.2.0
f6fb5000-f6fb6000 r--p 0012e000 08:12 52022                              /usr/lib/libX11.so.6.2.0
f6fb6000-f6fb9000 rw-p 0012f000 08:12 52022                              /usr/lib/libX11.so.6.2.0
f6fb9000-f6fc8000 r-xp 00000000 08:12 52040                              /usr/lib/libXext.so.6.4.0
f6fc8000-f6fc9000 r--p 0000e000 08:12 52040                              /usr/lib/libXext.so.6.4.0
f6fc9000-f6fca000 rw-p 0000f000 08:12 52040                              /usr/lib/libXext.so.6.4.0
f6fca000-f7763000 r-xp 00000000 08:12 421725                             /usr/lib/qt3/lib/libqt-mt.so.3.3.8
f7763000-f779b000 r--p 00799000 08:12 421725                             /usr/lib/qt3/lib/libqt-mt.so.3.3.8
f779b000-f77a3000 rw-p 007d1000 08:12 421725                             /usr/lib/qt3/lib/libqt-mt.so.3.3.8
f77a3000-f77a7000 rw-p f77a3000 00:00 0 
f77c4000-f77c5000 rw-p f77c4000 00:00 0 
f77c5000-f77e3000 r-xp 00000000 08:12 271024                             /lib/ld-2.9.so
f77e3000-f77e4000 r--p 0001d000 08:12 271024                             /lib/ld-2.9.so
f77e4000-f77e5000 rw-p 0001e000 08:12 271024                             /lib/ld-2.9.so
fffbb000-fffd0000 rw-p 7ffffffe9000 00:00 0                              [stack]
ffffe000-fffff000 r-xp ffffe000 00:00 0                                  [vdso]
[FAIL] fcm_graphic_merge src/control/top_level/check_idealise_4A.F90 /home/pclark/fcm/vn8.3_idealized/src/control/top_level/check_idealise_4A.F90.working /home/pclark/fcm/vn8.3_idealized/src/control/top_level/check_idealise_4A.F90.merge-left.r9602 /home/pclark/fcm/vn8.3_idealized/src/control/top_level/check_idealise_4A.F90.merge-right.r12919 # rc=2

Change History (4)

comment:1 Changed 5 years ago by pclark

The title should say dcm conflicts - ruddy autocorrect!

comment:2 Changed 5 years ago by ros

Hi Pete,

I'm guessing this is happening because the conflict is a rather large section of code. I've tested split/swap/join (s) on all the other file conflicts in this branch and all continues to work well. I will have a word with Andy, but I suspect this is not something we will be able to fix quickly. I think it would be better, as there is only one conflict in this file, to manually edit check_idealise_4A.F90 to resolve this conflict.

Regards,
Ros.

comment:3 Changed 5 years ago by pclark

Thanks - am doing so. I wouldn't have called that a large section of code, though.

comment:4 Changed 4 years ago by annette

  • Resolution set to answered
  • Status changed from new to closed
Note: See TracTickets for help on using tickets.