remove lib math because of bad interaction with gtk

git-svn-id: http://ltt.polymtl.ca/svn@808 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index d54bc2dfa6978a272e3683dda38673dcdc51c7a9..e70eec63c7ebfb92c8cf7e73045a68e054df19f7 100644 (file)
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -36,7 +36,7 @@ AC_PROG_CC
 
 # Checks for libraries.
 AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
-AC_CHECK_LIB([m], [round], M_LIBS="-lm",AC_MSG_ERROR([Mathematical libraries are missing.])  )
+#AC_CHECK_LIB([m], [round], M_LIBS="-lm",AC_MSG_ERROR([Mathematical libraries are missing.])  )
 
 
 # Checks for header files.

diff --git a/ltt/branches/poly/ltt/Makefile.am b/ltt/branches/poly/ltt/Makefile.am
index eda40575ddd8ed71e681c93eb660695c4a526344..cc5eed55a7bbe57e8de26d5fcccc803238c92e6b 100644 (file)
--- a/ltt/branches/poly/ltt/Makefile.am
+++ b/ltt/branches/poly/ltt/Makefile.am
@@ -9,11 +9,10 @@ SUBDIRS = convert
 libdir = ${lttlibdir}
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
-LIBS += $(GLIB_LIBS) $(M_LIBS)
+LIBS += $(GLIB_LIBS)
 
 lib_LTLIBRARIES = libtraceread.la
 libtraceread_la_SOURCES = event.c facility.c parser.c tracefile.c type.c
-libtraceread_la_LIBADD = -lm
 noinst_HEADERS = parser.h ltt-private.h
 
 lttinclude_HEADERS = \

diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h
index 6622decea9f9f9a7c4dd70689cb7b3f414321787..2aafdb23ef9d9999a0640c1b435bcef2d1fd25ef 100644 (file)
--- a/ltt/branches/poly/ltt/time.h
+++ b/ltt/branches/poly/ltt/time.h
@@ -116,9 +116,9 @@ static inline double ltt_time_to_double(LttTime t1)
   if(t1.tv_sec > MAX_TV_SEC_TO_DOUBLE)
     g_warning("Precision loss in conversion LttTime to double");
 #endif //EXTRA_CHECK
-  return round(((double)((guint64)t1.tv_sec<<DOUBLE_SHIFT)
+  return ((double)((guint64)t1.tv_sec<<DOUBLE_SHIFT)
                   * (double)DOUBLE_SHIFT_CONST_MUL)
-                  + (double)t1.tv_nsec);
+                  + (double)t1.tv_nsec;
 }
 
 
@@ -140,7 +140,7 @@ static inline LttTime ltt_time_from_double(double t1)
   LttTime res;
   //res.tv_sec = t1/(double)NANOSECONDS_PER_SECOND;
   res.tv_sec = (guint64)(t1 * DOUBLE_SHIFT_CONST_DIV) >> DOUBLE_SHIFT;
-  res.tv_nsec = (round(t1) - (((guint64)res.tv_sec<<LTT_TIME_UINT_SHIFT))
+  res.tv_nsec = (t1 - (((guint64)res.tv_sec<<LTT_TIME_UINT_SHIFT))
                                * LTT_TIME_UINT_SHIFT_CONST);
   return res;
 }

diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c
index cc953d8d8709cb1d1e41a190ffccbeaa014b4df9..00ffc9bf71a6a403ea9c5ee18f875e9291e18151 100644 (file)
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -1200,9 +1200,9 @@ int readBlock(LttTracefile * tf, int whichBlock)
 
   getCyclePerNsec(tf);
 
-  tf->overflow_nsec = round(
+  tf->overflow_nsec = 
                         (-((double)(tf->a_block_start->cycle_count&0xFFFFFFFF))
-                                        * tf->nsec_per_cycle));
+                                        * tf->nsec_per_cycle);
 
   tf->current_event_time = getEventTime(tf);  
 
@@ -1228,8 +1228,8 @@ void updateTracefile(LttTracefile * tf)
   tf->prev_event_time.tv_nsec = 0;
   tf->count = 0;
 
-  tf->overflow_nsec = round((-((double)tf->a_block_start->cycle_count)
-                                        * tf->nsec_per_cycle));
+  tf->overflow_nsec = (-((double)tf->a_block_start->cycle_count)
+                                        * tf->nsec_per_cycle);
 
 }
 
@@ -1310,7 +1310,7 @@ void getCyclePerNsec(LttTracefile * t)
   t->nsec_per_cycle = (double)lBufTotalNSec / (double)lBufTotalCycle;
 
   /* Pre-multiply one overflow (2^32 cycles) by nsec_per_cycle */
-  t->one_overflow_nsec = round(t->nsec_per_cycle * (double)0x100000000ULL);
+  t->one_overflow_nsec = t->nsec_per_cycle * (double)0x100000000ULL;
 
 }
 
@@ -1350,9 +1350,9 @@ static inline LttTime getEventTime(LttTracefile * tf)
   if(unlikely(evId == TRACE_BLOCK_START)) {
      lEventNSec = 0;
   } else if(unlikely(evId == TRACE_BLOCK_END)) {
-    lEventNSec = round(((double)
+    lEventNSec = ((double)
                  (tf->a_block_end->cycle_count - tf->a_block_start->cycle_count)
-                           * tf->nsec_per_cycle));
+                           * tf->nsec_per_cycle);
   }
 #if 0
   /* If you want to make heart beat a special case and use their own 64 bits
@@ -1367,7 +1367,7 @@ static inline LttTime getEventTime(LttTracefile * tf)
   }
 #endif //0
   else {
-    lEventNSec = (gint64)round(((double)cycle_count * tf->nsec_per_cycle))
+    lEventNSec = (gint64)((double)cycle_count * tf->nsec_per_cycle)
                                 +tf->overflow_nsec;
   }
 

diff --git a/ltt/branches/poly/lttv/lttv/Makefile.am b/ltt/branches/poly/lttv/lttv/Makefile.am
index eade395960b28d7960d5872b5b254b10957172da..3ccb55c3a4becce38f0e7c4ce28dc6ac729b9cc2 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/Makefile.am
+++ b/ltt/branches/poly/lttv/lttv/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
-LIBS += $(M_LIBS) $(POPT_LIBS) $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
+LIBS += $(POPT_LIBS) $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
 
 bin_PROGRAMS = lttv
 

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
index ee0fec10a88df33cb8040058117a559fde0f5f5e..7b4dc2736313ff642b531a5e1db6e42320273354 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
@@ -24,7 +24,7 @@
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
-LIBS += $(M_LIBS) $(GLIB_LIBS)
+LIBS += $(GLIB_LIBS)
 LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
@@ -33,7 +33,6 @@ lib_LTLIBRARIES = libguicontrolflow.la
 libguicontrolflow_la_LDFLAGS = -module
 libguicontrolflow_la_SOURCES =         module.c eventhooks.c cfv.c processlist.c\
                                drawing.c drawitem.c
-libguicontrolflow_la_LIBADD = -lm
 
 noinst_HEADERS =       eventhooks.h cfv.h processlist.h\
                                drawing.h drawitem.h

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
index 4f9d4899bfd09a187b300280535de9400f385d7f..9c0819801721b765fdaa39aff1ab1f8002a76ea1 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
@@ -25,7 +25,7 @@
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
-LIBS += $(M_LIBS) $(GLIB_LIBS)
+LIBS += $(GLIB_LIBS)
 LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
@@ -33,7 +33,6 @@ libdir = ${lttvplugindir}
 lib_LTLIBRARIES = libguievents.la
 libguievents_la_LDFLAGS = -module
 libguievents_la_SOURCES = events.c
-libguievents_la_LIBADD = -lm
 
 EXTRA_DIST = \
                hGuiEventsInsert.xpm

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
index 0c7a47a3055eb57b6ed4261e582050d41c6f98d8..05bd3a37d564248e80bbdeb847fa5ed2da8b0bca 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
-LIBS += $(M_LIBS) $(GLIB_LIBS)
+LIBS += $(GLIB_LIBS)
 LIBS += $(GTK_LIBS)
 
 INCLUDES = \
@@ -43,5 +43,5 @@ lttvwindowinclude_HEADERS = \
        menu.h\
        toolbar.h
 
-liblttvwindow_la_LIBADD = -lm @PACKAGE_LIBS@ $(INTLLIBS)
+liblttvwindow_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
 

diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
index 50883600aa8f92399ac6e27d1b808ef07729b0f5..cf582c23aee66c893ac85a108f559c614e1091d4 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
@@ -6,7 +6,7 @@
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
-LIBS += $(M_LIBS) $(GLIB_LIBS)
+LIBS += $(GLIB_LIBS)
 LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
@@ -14,7 +14,6 @@ libdir = ${lttvplugindir}
 lib_LTLIBRARIES = libguistatistics.la
 libguistatistics_la_LDFLAGS = -module
 libguistatistics_la_SOURCES = statistics.c
-libguistatistics_la_LIBADD = -lm
 
 EXTRA_DIST = \
                hGuiStatisticInsert.xpm

diff --git a/ltt/branches/poly/lttv/modules/text/Makefile.am b/ltt/branches/poly/lttv/modules/text/Makefile.am
index 9954becac1ffb597b029f88420579f200284d7ae..88f9235fc919e8d48d4afb726f9145965fb3f8ab 100644 (file)
--- a/ltt/branches/poly/lttv/modules/text/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/text/Makefile.am
@@ -1,17 +1,15 @@
 
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
-LIBS += $(M_LIBS) $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
+LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
 
 libdir = ${lttvplugindir}
 
 lib_LTLIBRARIES = libtextDump.la libbatchAnalysis.la
 libtextDump_la_LDFLAGS = -module
 libtextDump_la_SOURCES = textDump.c
-libtextDump_la_LIBADD = -lm
 libbatchAnalysis_la_LDFLAGS = -module
 libbatchAnalysis_la_SOURCES = batchAnalysis.c
-libbatchAnalysis_la_LIBADD = -lm
 
 noinst_HEADERS = \
        batchanalysis.h