From 78f79181138e0b98b5db684d6fba4432b32ddce7 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Wed, 1 Mar 2006 01:41:51 +0000
Subject: [PATCH] fix heartbeat

git-svn-id: http://ltt.polymtl.ca/svn@1565 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt/branches/poly/ChangeLog                   |   2 +
 ltt/branches/poly/configure.in                |   2 +-
 ltt/branches/poly/facilities/core.xml         |   9 -
 .../poly/facilities/kernel_arch_mips.xml      | 492 +++++++++---------
 ltt/branches/poly/ltt/ltt-private.h           |   3 +-
 ltt/branches/poly/ltt/tracefile.c             |   5 +-
 6 files changed, 254 insertions(+), 259 deletions(-)

diff --git a/ltt/branches/poly/ChangeLog b/ltt/branches/poly/ChangeLog
index 04e35941..7248fb69 100644
--- a/ltt/branches/poly/ChangeLog
+++ b/ltt/branches/poly/ChangeLog
@@ -1,5 +1,7 @@
 LinuxTraceToolkit ChangeLog
 
+28/02/2006	LTTV 0.8.24
+						Fix heartbeat support
 27/02/2006	LTTV 0.8.23
 						Add kernel_thread information in state.
 15/02/2006	LTTV 0.8.21
diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 9877a4d9..ba224632 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.23-27022006)
+AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.24-28022006)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
diff --git a/ltt/branches/poly/facilities/core.xml b/ltt/branches/poly/facilities/core.xml
index d45d8673..9750b037 100644
--- a/ltt/branches/poly/facilities/core.xml
+++ b/ltt/branches/poly/facilities/core.xml
@@ -1,14 +1,6 @@
 <facility name=core>
   <description>The core facility contains the basic tracing related events</description>
 	
-  <type name=timestamp>
-		<struct>
-			<field name="seconds"><uint size=4/></field>
-			<field name="nanoseconds"><uint size=4/></field>
-			<field name="cycle_count"><uint size=8/></field>
-		</struct>
-  </type>
-
   <event name=facility_load>
     <description>Facility is loaded</description>
 		<field name="name"><string/></field>
@@ -31,7 +23,6 @@
      rollovers. Useful when only the 32 LSB of the TSC are saved in events
      header : we save the full 64 bits in this event.
     </description>
-		<field name="timestamp"><typeref name=timestamp/></field>
   </event>
   
   <event name=state_dump_facility_load per_trace>
diff --git a/ltt/branches/poly/facilities/kernel_arch_mips.xml b/ltt/branches/poly/facilities/kernel_arch_mips.xml
index 05def993..1d2f6467 100644
--- a/ltt/branches/poly/facilities/kernel_arch_mips.xml
+++ b/ltt/branches/poly/facilities/kernel_arch_mips.xml
@@ -292,253 +292,253 @@
 			<label name=o32_inotify_add_watch value=4285/>
 			<label name=o32_inotify_rm_watch value=4286/>
 
-			<label name=64_base value=4999/>
-			<label name=64_read value=5000/>
-			<label name=64_write value=5001/>
-			<label name=64_open value=5002/>
-			<label name=64_close value=5003/>
-			<label name=64_stat value=5004/>
-			<label name=64_fstat value=5005/>
-			<label name=64_lstat value=5006/>
-			<label name=64_poll value=5007/>
-			<label name=64_lseek value=5008/>
-			<label name=64_mmap value=5009/>
-			<label name=64_mprotect value=5010/>
-			<label name=64_munmap value=5011/>
-			<label name=64_brk value=5012/>
-			<label name=64_rt_sigaction value=5013/>
-			<label name=64_rt_sigprocmask value=5014/>
-			<label name=64_ioctl value=5015/>
-			<label name=64_pread64 value=5016/>
-			<label name=64_pwrite64 value=5017/>
-			<label name=64_readv value=5018/>
-			<label name=64_writev value=5019/>
-			<label name=64_access value=5020/>
-			<label name=64_pipe value=5021/>
-			<label name=64__newselect value=5022/>
-			<label name=64_sched_yield value=5023/>
-			<label name=64_mremap value=5024/>
-			<label name=64_msync value=5025/>
-			<label name=64_mincore value=5026/>
-			<label name=64_madvise value=5027/>
-			<label name=64_shmget value=5028/>
-			<label name=64_shmat value=5029/>
-			<label name=64_shmctl value=5030/>
-			<label name=64_dup value=5031/>
-			<label name=64_dup2 value=5032/>
-			<label name=64_pause value=5033/>
-			<label name=64_nanosleep value=5034/>
-			<label name=64_getitimer value=5035/>
-			<label name=64_setitimer value=5036/>
-			<label name=64_alarm value=5037/>
-			<label name=64_getpid value=5038/>
-			<label name=64_sendfile value=5039/>
-			<label name=64_socket value=5040/>
-			<label name=64_connect value=5041/>
-			<label name=64_accept value=5042/>
-			<label name=64_sendto value=5043/>
-			<label name=64_recvfrom value=5044/>
-			<label name=64_sendmsg value=5045/>
-			<label name=64_recvmsg value=5046/>
-			<label name=64_shutdown value=5047/>
-			<label name=64_bind value=5048/>
-			<label name=64_listen value=5049/>
-			<label name=64_getsockname value=5050/>
-			<label name=64_getpeername value=5051/>
-			<label name=64_socketpair value=5052/>
-			<label name=64_setsockopt value=5053/>
-			<label name=64_getsockopt value=5054/>
-			<label name=64_clone value=5055/>
-			<label name=64_fork value=5056/>
-			<label name=64_execve value=5057/>
-			<label name=64_exit value=5058/>
-			<label name=64_wait4 value=5059/>
-			<label name=64_kill value=5060/>
-			<label name=64_uname value=5061/>
-			<label name=64_semget value=5062/>
-			<label name=64_semop value=5063/>
-			<label name=64_semctl value=5064/>
-			<label name=64_shmdt value=5065/>
-			<label name=64_msgget value=5066/>
-			<label name=64_msgsnd value=5067/>
-			<label name=64_msgrcv value=5068/>
-			<label name=64_msgctl value=5069/>
-			<label name=64_fcntl value=5070/>
-			<label name=64_flock value=5071/>
-			<label name=64_fsync value=5072/>
-			<label name=64_fdatasync value=5073/>
-			<label name=64_truncate value=5074/>
-			<label name=64_ftruncate value=5075/>
-			<label name=64_getdents value=5076/>
-			<label name=64_getcwd value=5077/>
-			<label name=64_chdir value=5078/>
-			<label name=64_fchdir value=5079/>
-			<label name=64_rename value=5080/>
-			<label name=64_mkdir value=5081/>
-			<label name=64_rmdir value=5082/>
-			<label name=64_creat value=5083/>
-			<label name=64_link value=5084/>
-			<label name=64_unlink value=5085/>
-			<label name=64_symlink value=5086/>
-			<label name=64_readlink value=5087/>
-			<label name=64_chmod value=5088/>
-			<label name=64_fchmod value=5089/>
-			<label name=64_chown value=5090/>
-			<label name=64_fchown value=5091/>
-			<label name=64_lchown value=5092/>
-			<label name=64_umask value=5093/>
-			<label name=64_gettimeofday value=5094/>
-			<label name=64_getrlimit value=5095/>
-			<label name=64_getrusage value=5096/>
-			<label name=64_sysinfo value=5097/>
-			<label name=64_times value=5098/>
-			<label name=64_ptrace value=5099/>
-			<label name=64_getuid value=5100/>
-			<label name=64_syslog value=5101/>
-			<label name=64_getgid value=5102/>
-			<label name=64_setuid value=5103/>
-			<label name=64_setgid value=5104/>
-			<label name=64_geteuid value=5105/>
-			<label name=64_getegid value=5106/>
-			<label name=64_setpgid value=5107/>
-			<label name=64_getppid value=5108/>
-			<label name=64_getpgrp value=5109/>
-			<label name=64_setsid value=5110/>
-			<label name=64_setreuid value=5111/>
-			<label name=64_setregid value=5112/>
-			<label name=64_getgroups value=5113/>
-			<label name=64_setgroups value=5114/>
-			<label name=64_setresuid value=5115/>
-			<label name=64_getresuid value=5116/>
-			<label name=64_setresgid value=5117/>
-			<label name=64_getresgid value=5118/>
-			<label name=64_getpgid value=5119/>
-			<label name=64_setfsuid value=5120/>
-			<label name=64_setfsgid value=5121/>
-			<label name=64_getsid value=5122/>
-			<label name=64_capget value=5123/>
-			<label name=64_capset value=5124/>
-			<label name=64_rt_sigpending value=5125/>
-			<label name=64_rt_sigtimedwait value=5126/>
-			<label name=64_rt_sigqueueinfo value=5127/>
-			<label name=64_rt_sigsuspend value=5128/>
-			<label name=64_sigaltstack value=5129/>
-			<label name=64_utime value=5130/>
-			<label name=64_mknod value=5131/>
-			<label name=64_personality value=5132/>
-			<label name=64_ustat value=5133/>
-			<label name=64_statfs value=5134/>
-			<label name=64_fstatfs value=5135/>
-			<label name=64_sysfs value=5136/>
-			<label name=64_getpriority value=5137/>
-			<label name=64_setpriority value=5138/>
-			<label name=64_sched_setparam value=5139/>
-			<label name=64_sched_getparam value=5140/>
-			<label name=64_sched_setscheduler value=5141/>
-			<label name=64_sched_getscheduler value=5142/>
-			<label name=64_sched_get_priority_max value=5143/>
-			<label name=64_sched_get_priority_min value=5144/>
-			<label name=64_sched_rr_get_interval value=5145/>
-			<label name=64_mlock value=5146/>
-			<label name=64_munlock value=5147/>
-			<label name=64_mlockall value=5148/>
-			<label name=64_munlockall value=5149/>
-			<label name=64_vhangup value=5150/>
-			<label name=64_pivot_root value=5151/>
-			<label name=64__sysctl value=5152/>
-			<label name=64_prctl value=5153/>
-			<label name=64_adjtimex value=5154/>
-			<label name=64_setrlimit value=5155/>
-			<label name=64_chroot value=5156/>
-			<label name=64_sync value=5157/>
-			<label name=64_acct value=5158/>
-			<label name=64_settimeofday value=5159/>
-			<label name=64_mount value=5160/>
-			<label name=64_umount2 value=5161/>
-			<label name=64_swapon value=5162/>
-			<label name=64_swapoff value=5163/>
-			<label name=64_reboot value=5164/>
-			<label name=64_sethostname value=5165/>
-			<label name=64_setdomainname value=5166/>
-			<label name=64_create_module value=5167/>
-			<label name=64_init_module value=5168/>
-			<label name=64_delete_module value=5169/>
-			<label name=64_get_kernel_syms value=5170/>
-			<label name=64_query_module value=5171/>
-			<label name=64_quotactl value=5172/>
-			<label name=64_nfsservctl value=5173/>
-			<label name=64_getpmsg value=5174/>
-			<label name=64_putpmsg value=5175/>
-			<label name=64_afs_syscall value=5176/>
-			<label name=64_reserved177 value=5177/>
-			<label name=64_gettid value=5178/>
-			<label name=64_readahead value=5179/>
-			<label name=64_setxattr value=5180/>
-			<label name=64_lsetxattr value=5181/>
-			<label name=64_fsetxattr value=5182/>
-			<label name=64_getxattr value=5183/>
-			<label name=64_lgetxattr value=5184/>
-			<label name=64_fgetxattr value=5185/>
-			<label name=64_listxattr value=5186/>
-			<label name=64_llistxattr value=5187/>
-			<label name=64_flistxattr value=5188/>
-			<label name=64_removexattr value=5189/>
-			<label name=64_lremovexattr value=5190/>
-			<label name=64_fremovexattr value=5191/>
-			<label name=64_tkill value=5192/>
-			<label name=64_reserved193 value=5193/>
-			<label name=64_futex value=5194/>
-			<label name=64_sched_setaffinity value=5195/>
-			<label name=64_sched_getaffinity value=5196/>
-			<label name=64_cacheflush value=5197/>
-			<label name=64_cachectl value=5198/>
-			<label name=64_sysmips value=5199/>
-			<label name=64_io_setup value=5200/>
-			<label name=64_io_destroy value=5201/>
-			<label name=64_io_getevents value=5202/>
-			<label name=64_io_submit value=5203/>
-			<label name=64_io_cancel value=5204/>
-			<label name=64_exit_group value=5205/>
-			<label name=64_lookup_dcookie value=5206/>
-			<label name=64_epoll_create value=5207/>
-			<label name=64_epoll_ctl value=5208/>
-			<label name=64_epoll_wait value=5209/>
-			<label name=64_remap_file_pages value=5210/>
-			<label name=64_rt_sigreturn value=5211/>
-			<label name=64_set_tid_address value=5212/>
-			<label name=64_restart_syscall value=5213/>
-			<label name=64_semtimedop value=5214/>
-			<label name=64_fadvise64 value=5215/>
-			<label name=64_timer_create value=5216/>
-			<label name=64_timer_settime value=5217/>
-			<label name=64_timer_gettime value=5218/>
-			<label name=64_timer_getoverrun value=5219/>
-			<label name=64_timer_delete value=5220/>
-			<label name=64_clock_settime value=5221/>
-			<label name=64_clock_gettime value=5222/>
-			<label name=64_clock_getres value=5223/>
-			<label name=64_clock_nanosleep value=5224/>
-			<label name=64_tgkill value=5225/>
-			<label name=64_utimes value=5226/>
-			<label name=64_mbind value=5227/>
-			<label name=64_get_mempolicy value=5228/>
-			<label name=64_set_mempolicy value=5229/>
-			<label name=64_mq_open value=5230/>
-			<label name=64_mq_unlink value=5231/>
-			<label name=64_mq_timedsend value=5232/>
-			<label name=64_mq_timedreceive value=5233/>
-			<label name=64_mq_notify value=5234/>
-			<label name=64_mq_getsetattr value=5235/>
-			<label name=64_vserver value=5236/>
-			<label name=64_waitid value=5237/>
+			<label name=l64_base value=4999/>
+			<label name=l64_read value=5000/>
+			<label name=l64_write value=5001/>
+			<label name=l64_open value=5002/>
+			<label name=l64_close value=5003/>
+			<label name=l64_stat value=5004/>
+			<label name=l64_fstat value=5005/>
+			<label name=l64_lstat value=5006/>
+			<label name=l64_poll value=5007/>
+			<label name=l64_lseek value=5008/>
+			<label name=l64_mmap value=5009/>
+			<label name=l64_mprotect value=5010/>
+			<label name=l64_munmap value=5011/>
+			<label name=l64_brk value=5012/>
+			<label name=l64_rt_sigaction value=5013/>
+			<label name=l64_rt_sigprocmask value=5014/>
+			<label name=l64_ioctl value=5015/>
+			<label name=l64_pread64 value=5016/>
+			<label name=l64_pwrite64 value=5017/>
+			<label name=l64_readv value=5018/>
+			<label name=l64_writev value=5019/>
+			<label name=l64_access value=5020/>
+			<label name=l64_pipe value=5021/>
+			<label name=l64__newselect value=5022/>
+			<label name=l64_sched_yield value=5023/>
+			<label name=l64_mremap value=5024/>
+			<label name=l64_msync value=5025/>
+			<label name=l64_mincore value=5026/>
+			<label name=l64_madvise value=5027/>
+			<label name=l64_shmget value=5028/>
+			<label name=l64_shmat value=5029/>
+			<label name=l64_shmctl value=5030/>
+			<label name=l64_dup value=5031/>
+			<label name=l64_dup2 value=5032/>
+			<label name=l64_pause value=5033/>
+			<label name=l64_nanosleep value=5034/>
+			<label name=l64_getitimer value=5035/>
+			<label name=l64_setitimer value=5036/>
+			<label name=l64_alarm value=5037/>
+			<label name=l64_getpid value=5038/>
+			<label name=l64_sendfile value=5039/>
+			<label name=l64_socket value=5040/>
+			<label name=l64_connect value=5041/>
+			<label name=l64_accept value=5042/>
+			<label name=l64_sendto value=5043/>
+			<label name=l64_recvfrom value=5044/>
+			<label name=l64_sendmsg value=5045/>
+			<label name=l64_recvmsg value=5046/>
+			<label name=l64_shutdown value=5047/>
+			<label name=l64_bind value=5048/>
+			<label name=l64_listen value=5049/>
+			<label name=l64_getsockname value=5050/>
+			<label name=l64_getpeername value=5051/>
+			<label name=l64_socketpair value=5052/>
+			<label name=l64_setsockopt value=5053/>
+			<label name=l64_getsockopt value=5054/>
+			<label name=l64_clone value=5055/>
+			<label name=l64_fork value=5056/>
+			<label name=l64_execve value=5057/>
+			<label name=l64_exit value=5058/>
+			<label name=l64_wait4 value=5059/>
+			<label name=l64_kill value=5060/>
+			<label name=l64_uname value=5061/>
+			<label name=l64_semget value=5062/>
+			<label name=l64_semop value=5063/>
+			<label name=l64_semctl value=5064/>
+			<label name=l64_shmdt value=5065/>
+			<label name=l64_msgget value=5066/>
+			<label name=l64_msgsnd value=5067/>
+			<label name=l64_msgrcv value=5068/>
+			<label name=l64_msgctl value=5069/>
+			<label name=l64_fcntl value=5070/>
+			<label name=l64_flock value=5071/>
+			<label name=l64_fsync value=5072/>
+			<label name=l64_fdatasync value=5073/>
+			<label name=l64_truncate value=5074/>
+			<label name=l64_ftruncate value=5075/>
+			<label name=l64_getdents value=5076/>
+			<label name=l64_getcwd value=5077/>
+			<label name=l64_chdir value=5078/>
+			<label name=l64_fchdir value=5079/>
+			<label name=l64_rename value=5080/>
+			<label name=l64_mkdir value=5081/>
+			<label name=l64_rmdir value=5082/>
+			<label name=l64_creat value=5083/>
+			<label name=l64_link value=5084/>
+			<label name=l64_unlink value=5085/>
+			<label name=l64_symlink value=5086/>
+			<label name=l64_readlink value=5087/>
+			<label name=l64_chmod value=5088/>
+			<label name=l64_fchmod value=5089/>
+			<label name=l64_chown value=5090/>
+			<label name=l64_fchown value=5091/>
+			<label name=l64_lchown value=5092/>
+			<label name=l64_umask value=5093/>
+			<label name=l64_gettimeofday value=5094/>
+			<label name=l64_getrlimit value=5095/>
+			<label name=l64_getrusage value=5096/>
+			<label name=l64_sysinfo value=5097/>
+			<label name=l64_times value=5098/>
+			<label name=l64_ptrace value=5099/>
+			<label name=l64_getuid value=5100/>
+			<label name=l64_syslog value=5101/>
+			<label name=l64_getgid value=5102/>
+			<label name=l64_setuid value=5103/>
+			<label name=l64_setgid value=5104/>
+			<label name=l64_geteuid value=5105/>
+			<label name=l64_getegid value=5106/>
+			<label name=l64_setpgid value=5107/>
+			<label name=l64_getppid value=5108/>
+			<label name=l64_getpgrp value=5109/>
+			<label name=l64_setsid value=5110/>
+			<label name=l64_setreuid value=5111/>
+			<label name=l64_setregid value=5112/>
+			<label name=l64_getgroups value=5113/>
+			<label name=l64_setgroups value=5114/>
+			<label name=l64_setresuid value=5115/>
+			<label name=l64_getresuid value=5116/>
+			<label name=l64_setresgid value=5117/>
+			<label name=l64_getresgid value=5118/>
+			<label name=l64_getpgid value=5119/>
+			<label name=l64_setfsuid value=5120/>
+			<label name=l64_setfsgid value=5121/>
+			<label name=l64_getsid value=5122/>
+			<label name=l64_capget value=5123/>
+			<label name=l64_capset value=5124/>
+			<label name=l64_rt_sigpending value=5125/>
+			<label name=l64_rt_sigtimedwait value=5126/>
+			<label name=l64_rt_sigqueueinfo value=5127/>
+			<label name=l64_rt_sigsuspend value=5128/>
+			<label name=l64_sigaltstack value=5129/>
+			<label name=l64_utime value=5130/>
+			<label name=l64_mknod value=5131/>
+			<label name=l64_personality value=5132/>
+			<label name=l64_ustat value=5133/>
+			<label name=l64_statfs value=5134/>
+			<label name=l64_fstatfs value=5135/>
+			<label name=l64_sysfs value=5136/>
+			<label name=l64_getpriority value=5137/>
+			<label name=l64_setpriority value=5138/>
+			<label name=l64_sched_setparam value=5139/>
+			<label name=l64_sched_getparam value=5140/>
+			<label name=l64_sched_setscheduler value=5141/>
+			<label name=l64_sched_getscheduler value=5142/>
+			<label name=l64_sched_get_priority_max value=5143/>
+			<label name=l64_sched_get_priority_min value=5144/>
+			<label name=l64_sched_rr_get_interval value=5145/>
+			<label name=l64_mlock value=5146/>
+			<label name=l64_munlock value=5147/>
+			<label name=l64_mlockall value=5148/>
+			<label name=l64_munlockall value=5149/>
+			<label name=l64_vhangup value=5150/>
+			<label name=l64_pivot_root value=5151/>
+			<label name=l64__sysctl value=5152/>
+			<label name=l64_prctl value=5153/>
+			<label name=l64_adjtimex value=5154/>
+			<label name=l64_setrlimit value=5155/>
+			<label name=l64_chroot value=5156/>
+			<label name=l64_sync value=5157/>
+			<label name=l64_acct value=5158/>
+			<label name=l64_settimeofday value=5159/>
+			<label name=l64_mount value=5160/>
+			<label name=l64_umount2 value=5161/>
+			<label name=l64_swapon value=5162/>
+			<label name=l64_swapoff value=5163/>
+			<label name=l64_reboot value=5164/>
+			<label name=l64_sethostname value=5165/>
+			<label name=l64_setdomainname value=5166/>
+			<label name=l64_create_module value=5167/>
+			<label name=l64_init_module value=5168/>
+			<label name=l64_delete_module value=5169/>
+			<label name=l64_get_kernel_syms value=5170/>
+			<label name=l64_query_module value=5171/>
+			<label name=l64_quotactl value=5172/>
+			<label name=l64_nfsservctl value=5173/>
+			<label name=l64_getpmsg value=5174/>
+			<label name=l64_putpmsg value=5175/>
+			<label name=l64_afs_syscall value=5176/>
+			<label name=l64_reserved177 value=5177/>
+			<label name=l64_gettid value=5178/>
+			<label name=l64_readahead value=5179/>
+			<label name=l64_setxattr value=5180/>
+			<label name=l64_lsetxattr value=5181/>
+			<label name=l64_fsetxattr value=5182/>
+			<label name=l64_getxattr value=5183/>
+			<label name=l64_lgetxattr value=5184/>
+			<label name=l64_fgetxattr value=5185/>
+			<label name=l64_listxattr value=5186/>
+			<label name=l64_llistxattr value=5187/>
+			<label name=l64_flistxattr value=5188/>
+			<label name=l64_removexattr value=5189/>
+			<label name=l64_lremovexattr value=5190/>
+			<label name=l64_fremovexattr value=5191/>
+			<label name=l64_tkill value=5192/>
+			<label name=l64_reserved193 value=5193/>
+			<label name=l64_futex value=5194/>
+			<label name=l64_sched_setaffinity value=5195/>
+			<label name=l64_sched_getaffinity value=5196/>
+			<label name=l64_cacheflush value=5197/>
+			<label name=l64_cachectl value=5198/>
+			<label name=l64_sysmips value=5199/>
+			<label name=l64_io_setup value=5200/>
+			<label name=l64_io_destroy value=5201/>
+			<label name=l64_io_getevents value=5202/>
+			<label name=l64_io_submit value=5203/>
+			<label name=l64_io_cancel value=5204/>
+			<label name=l64_exit_group value=5205/>
+			<label name=l64_lookup_dcookie value=5206/>
+			<label name=l64_epoll_create value=5207/>
+			<label name=l64_epoll_ctl value=5208/>
+			<label name=l64_epoll_wait value=5209/>
+			<label name=l64_remap_file_pages value=5210/>
+			<label name=l64_rt_sigreturn value=5211/>
+			<label name=l64_set_tid_address value=5212/>
+			<label name=l64_restart_syscall value=5213/>
+			<label name=l64_semtimedop value=5214/>
+			<label name=l64_fadvise64 value=5215/>
+			<label name=l64_timer_create value=5216/>
+			<label name=l64_timer_settime value=5217/>
+			<label name=l64_timer_gettime value=5218/>
+			<label name=l64_timer_getoverrun value=5219/>
+			<label name=l64_timer_delete value=5220/>
+			<label name=l64_clock_settime value=5221/>
+			<label name=l64_clock_gettime value=5222/>
+			<label name=l64_clock_getres value=5223/>
+			<label name=l64_clock_nanosleep value=5224/>
+			<label name=l64_tgkill value=5225/>
+			<label name=l64_utimes value=5226/>
+			<label name=l64_mbind value=5227/>
+			<label name=l64_get_mempolicy value=5228/>
+			<label name=l64_set_mempolicy value=5229/>
+			<label name=l64_mq_open value=5230/>
+			<label name=l64_mq_unlink value=5231/>
+			<label name=l64_mq_timedsend value=5232/>
+			<label name=l64_mq_timedreceive value=5233/>
+			<label name=l64_mq_notify value=5234/>
+			<label name=l64_mq_getsetattr value=5235/>
+			<label name=l64_vserver value=5236/>
+			<label name=l64_waitid value=5237/>
 
-			<label name=64_add_key value=5239/>
-			<label name=64_request_key value=5240/>
-			<label name=64_keyctl value=5241/>
-			<label name=64_set_thread_area value=5242/>
-			<label name=64_inotify_init value=5243/>
-			<label name=64_inotify_add_watch value=5244/>
-			<label name=64_inotify_rm_watch value=5245/>
+			<label name=l64_add_key value=5239/>
+			<label name=l64_request_key value=5240/>
+			<label name=l64_keyctl value=5241/>
+			<label name=l64_set_thread_area value=5242/>
+			<label name=l64_inotify_init value=5243/>
+			<label name=l64_inotify_add_watch value=5244/>
+			<label name=l64_inotify_rm_watch value=5245/>
 
 			<label name=N32_base value=5999/>
 			<label name=N32_read value=6000/>
diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h
index c7c4deef..98e5b342 100644
--- a/ltt/branches/poly/ltt/ltt-private.h
+++ b/ltt/branches/poly/ltt/ltt-private.h
@@ -127,9 +127,8 @@ struct LttStateDumpFacilityLoad {
 	guint32	has_alignment;
 } LTT_PACKED_STRUCT;
 
+/* Empty event */
 typedef struct _TimeHeartbeat {
-  LttTime       time;       //Time stamp of this block
-  uint64_t cycle_count; //cycle count of the event
 } LTT_PACKED_STRUCT TimeHeartbeat;
 
 struct ltt_event_header_hb {
diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c
index 3fbf3b2e..79063373 100644
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -1582,6 +1582,10 @@ int ltt_tracefile_seek_position(LttTracefile *tf, const LttEventPosition *ep) {
 
   tf->event.offset = ep->offset;
 
+	/* Put back the event real tsc */
+	tf->event.tsc = ep->tsc;
+	tf->buffer.tsc = ep->tsc;
+
   err = ltt_tracefile_read_update_event(tf);
   if(err) goto fail;
   err = ltt_tracefile_read_op(tf);
@@ -1742,7 +1746,6 @@ int ltt_tracefile_read_update_event(LttTracefile *tf)
 		tf->buffer.tsc = event->tsc;
 		pos += sizeof(guint64);
 	}
-	
 	event->event_time = ltt_interpolate_time(tf, event);
   event->facility_id = *(guint8*)pos;
   pos += sizeof(guint8);
-- 
2.34.1