From: John L. <mov...@us...> - 2002-10-19 21:23:42
|
Update of /cvsroot/oprofile/oprofile/dae In directory usw-pr-cvs1:/tmp/cvs-serv23550/dae Modified Files: Makefile.in oprofiled.c Log Message: Graydon's ABI patch. Index: Makefile.in =================================================================== RCS file: /cvsroot/oprofile/oprofile/dae/Makefile.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Makefile.in 7 Jun 2002 12:01:55 -0000 1.33 +++ Makefile.in 19 Oct 2002 21:23:39 -0000 1.34 @@ -4,8 +4,8 @@ SOURCES=opd_stats.c opd_kernel.c opd_proc.c opd_image.c opd_mapping.c opd_parse_proc.c opd_sample_files.c oprofiled.c OBJECTS=opd_stats.o opd_kernel.o opd_proc.o opd_image.o opd_mapping.o opd_parse_proc.o opd_sample_files.o oprofiled.o TARGET=oprofiled -LIBDEPS=../libdb/libdb.a ../libop/libop.a ../libutil/libutil.a -LIBS=-ldb -lop -lutil -lpopt -liberty +LIBDEPS=../libdb/libdb.a $(ABI_LIB) ../libop/libop.a ../libutil/libutil.a +LIBS=-ldb $(ABI_LINK) -lop -lutil -lpopt -liberty all: $(TARGET) @@ -19,6 +19,6 @@ rm -rf .deps $(OBJECTS) $(TARGET) $(TARGET): $(OBJECTS) $(LIBDEPS) - $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBS) + $(CXX) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBS) include ../make.deps Index: oprofiled.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/dae/oprofiled.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- oprofiled.c 15 Oct 2002 14:14:41 -0000 1.102 +++ oprofiled.c 19 Oct 2002 21:23:39 -0000 1.103 @@ -31,6 +31,9 @@ #include "op_interface.h" #include "op_hw_config.h" #include "op_config_24.h" +#ifdef OPROF_ABI +#include "op_abi.h" +#endif #include <unistd.h> #include <signal.h> @@ -725,6 +728,9 @@ int main(int argc, char const * argv[]) { struct op_buffer_head * sbuf; +#ifdef OPROF_ABI + char * cbuf; +#endif size_t s_buf_bytesize; struct op_note * nbuf; size_t n_buf_bytesize; @@ -740,6 +746,14 @@ nbuf = xmalloc(n_buf_bytesize); opd_init_kernel_image(); + +#ifdef OPROF_ABI + cbuf = xmalloc(strlen(OP_BASE_DIR) + 5); + strcpy(cbuf, OP_BASE_DIR); + strcat(cbuf, "/abi"); + op_write_abi_to_file(cbuf); + free(cbuf); +#endif if (atexit(clean_exit)) { fprintf(stderr, "Couldn't set exit cleanup !\n"); |