commit preload for openSUSE:Factory

26 Mar 2009

Hello community,

here is the log from the commit of package preload for openSUSE:Factory
checked in at Fri Mar 27 00:50:10 CET 2009.


--------

--- preload/preload.changes	2009-02-25 10:52:23.000000000 +0100
+++ preload/preload.changes	2009-03-25 21:30:59.162793000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 25 21:30:20 CET 2009 - coolo@suse.de
+
+- several fixes
+- removed remap support - not everyone has its root on sda6 :)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  ext3remapper-r129.diff
  ext3remapper-r129.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ preload.spec ++++++
--- /var/tmp/diff_new_pack.B19992/_old	2009-03-27 00:49:20.000000000 +0100
+++ /var/tmp/diff_new_pack.B19992/_new	2009-03-27 00:49:20.000000000 +0100
@@ -20,20 +20,17 @@
 
 Name:           preload
 Version:        1.0
-Release:        2
+Release:        3
 Summary:        Preloads Files into System Cache for Faster Booting
 License:        GPL v2 or later
 Group:          System/Boot
 # svn export https://svn.suse.de/svn/desktop/trunk/preload
 Source0:        preload.tar.bz2
 Source1:        %name-rpmlintrc
-# svn export http://prefetch.googlecode.com/svn/trunk/ext3remapper
-Source3:        ext3remapper-r129.tar.bz2
-Patch0:         ext3remapper-r129.diff
 Source6:        bootfaster.diff
 Source7:        waitfornm
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  blktrace e2fsprogs-devel update-desktop-files
+BuildRequires:  e2fsprogs-devel update-desktop-files
 PreReq:         %fillup_prereq %insserv_prereq
 # for the kmp
 BuildRequires:  kernel-default-debuginfo kernel-source kernel-syms module-init-tools systemtap
@@ -76,13 +73,11 @@
     Michael Matz <matz@suse.de>
 
 %prep
-%setup -n preload -a 3
-%patch -p0
+%setup -n preload
 mkdir obj
 
 %build
 make "CFLAGS=$RPM_OPT_FLAGS"
-make -C ext3remapper-r129 "CC=gcc $RPM_OPT_FLAGS"
 for flavor in %flavors_to_build; do
     rm -rf obj/$flavor
     rm -rf source
@@ -98,9 +93,6 @@
 
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/bin
-for prog in e2block2file e2remapblocks preloadblocks; do
-   install -m755 ext3remapper-r129/$prog $RPM_BUILD_ROOT%_bindir
-done
 mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
@@ -154,6 +146,9 @@
 #/opt/kde3
 
 %changelog
+* Wed Mar 25 2009 coolo@suse.de
+- several fixes
+- removed remap support - not everyone has its root on sda6 :)
 * Wed Feb 25 2009 coolo@suse.de
 - preload requires stapio
 * Thu Feb 12 2009 coolo@suse.de

++++++ preload.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/init.earlyxdm new/preload/init.earlyxdm
--- old/preload/init.earlyxdm	2009-01-31 14:32:57.000000000 +0100
+++ new/preload/init.earlyxdm	2009-03-25 15:15:45.000000000 +0100
@@ -11,7 +11,7 @@
 #
 ### BEGIN INIT INFO
 # Provides:          earlyxdm
-# Required-Start:    earlysyslog $local_fs
+# Required-Start:    earlysyslog $local_fs dbus
 # Should-Start:      gpm firstboot
 # Should-Stop:       $null
 # Required-Stop:     $null
@@ -105,7 +105,7 @@
 check || exit 0
 
 # preloading
-if test "$1" = "start" && test -x /sbin/preload && test -e /etc/cron.daily/suse.de-update-preload; then
+if test "$1" = "start" && test -x /sbin/preload; then
 
        if test -n "$DISPLAYMANAGER_AUTOLOGIN"; then
                /sbin/preload-client xsession &
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/init.startpreload new/preload/init.startpreload
--- old/preload/init.startpreload	2009-02-06 12:36:25.000000000 +0100
+++ new/preload/init.startpreload	2009-03-25 15:15:45.000000000 +0100
@@ -6,7 +6,7 @@
 # Provides:          boot.startpreload
 # Required-Start:    
 # Required-Stop:   
-# X-Start-Before:    boot.udev
+# X-Start-Before:    boot.rootfsck boot.udev
 # Default-Start:     B
 # Default-Stop:
 # Description:       Start blktrace if the kernel cmdline has remap in it
@@ -33,12 +33,6 @@
         preload=1
   	for o in $(cat /proc/cmdline); do 
 	    case $o in
-	        remap)
-                   if test -n "$ROOT_IS_EXT3" && test -x /bin/blktrace; then
-	               echo "Activating blktrace on $ROOT_IS_EXT3..."
-                       /bin/blktrace -r /sys/kernel/debug -d $ROOT_IS_EXT3 -o /dev/shm/blktrace.out &
-                   fi
-		   ;;
 		nopreload)
 		   preload=0
 		   ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/init.stoppreload new/preload/init.stoppreload
--- old/preload/init.stoppreload	2009-02-06 12:36:25.000000000 +0100
+++ new/preload/init.stoppreload	2009-03-25 15:15:45.000000000 +0100
@@ -4,7 +4,7 @@
 #
 ### BEGIN INIT INFO
 # Provides:          stoppreload
-# Required-Start:    $ALL boot.preload $remote_fs
+# Required-Start:    $ALL boot.startpreload $remote_fs
 # Required-Stop:     $null
 # Default-Start:     1 2 3 5
 # Default-Stop:
@@ -24,18 +24,11 @@
   	  echo "Stopping blktrace..."
 	  kill $pid
         fi
-        if nice /usr/bin/ionice -c3 /usr/bin/prepare_preload < /dev/shm/preloadtrace.log > /var/cache/preload/prepared.$$; then
+        ( if nice /usr/bin/ionice -c3 /usr/bin/prepare_preload < /dev/shm/preloadtrace.log > /var/cache/preload/prepared.$$; then
            mv /var/cache/preload/prepared.$$ /var/cache/preload/prepared
+	   gzip -c /dev/shm/preloadtrace.log >  /var/cache/preload/trace.gz
            rm /dev/shm/preloadtrace.log
-        fi
-        if test -n `ls -1 /dev/shm/blkparse* 2> /dev/null`; then
-          blkparse -i /dev/shm/blktrace.out > /var/run/blktrace
-          cut -b45- /var/run/blktrace | sed -e "s, RM , R ," | grep " R " | \
-            sed -e "s, *R \([0-9]*\) + \([0-9]\).*,\1+\2," | grep '^[0-9+]*$' > /var/run/lastblks
-          ionice -c 3 e2block2file -t -n /var/run/lastblks /dev/sda6  > /tmp/mapped.$$
-          mv /tmp/mapped.$$ /var/run/blksmapped
-	  rm -f /dev/shm/blktrace*
-        fi
+        fi ) &
 	rc_status -v -r
 	;;
     stop)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/Makefile new/preload/Makefile
--- old/preload/Makefile	2009-02-02 15:11:16.000000000 +0100
+++ new/preload/Makefile	2009-03-25 21:47:16.000000000 +0100
@@ -1,14 +1,19 @@
 
-all: preload preload-client print-bmap
+all: preload preload-client print-bmap 
 
-CFLAGS=-g3
+CFLAGS=-g3 -O2 -W -Wall -D_FORTIFY_SOURCE=2 -fstack-protector
 
 print-bmap:
 	gcc $(CFLAGS) -W -Wall -o print-bmap print-bmap.c
 
-stap/preload.ko:
+mall: all stap/preloadtrace.ko
+
+stap/preloadtrace.ko: stap/preloadtrace.stp /boot/vmlinuz-$(shell uname -r)
 	cd stap ;\
-	  stap -p 4 -DMAXSTRINGSIZE=300 -DMAXSKIPPED=2000 -m preload preload.stp
+	  stap -p 4 -DMAXSTRINGSIZE=300 -DMAXSKIPPED=2000 -m preloadtrace preloadtrace.stp
+
+minstall: mall # install
+	install -D -m 755 stap/preloadtrace.ko /lib/modules/`uname -r`/systemtap/preloadtrace.ko
 
 preload: preload.c
 	gcc $(CFLAGS) preload.c -lpthread -o preload
@@ -20,7 +25,7 @@
 	install -m 755 preload /sbin
 	install -m 755 preload-client /sbin
 	install -m 755 init.earlyxdm /etc/init.d/earlyxdm
-	install -m 755 init.blktrace /etc/init.d/boot.blktrace
-	install -m 755 init.stopblktrace /etc/init.d/stopblktrace
+	install -m 755 init.startpreload /etc/init.d/boot.startpreload
+	install -m 755 init.stoppreload /etc/init.d/stoppreload
 	install -m 755 prepare_preload /usr/bin/prepare_preload
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/preload.c new/preload/preload.c
--- old/preload/preload.c	2009-02-02 15:11:16.000000000 +0100
+++ new/preload/preload.c	2009-03-25 21:47:16.000000000 +0100
@@ -23,6 +23,7 @@
 #include <sys/un.h>
 #include <errno.h>
 #include <stdio.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -230,7 +231,7 @@
   struct dirent **list = 0;
   int dir_fd = -1;
   struct stat buf;
-  char *recurse_here;
+  char *recurse_here = 0;
 
   total = scandir (dirname, &list, NULL, (int (*)(const void*, const void*))comp_inodes);
 
@@ -374,7 +375,7 @@
 	break;
       }
       case 'n': {
-	unsigned int num, i;
+	unsigned int num;
 	if (sscanf (buf + 2, "%d", &num) == 1)
 	  {
 	    all_commands = malloc(num * sizeof(struct command));
@@ -383,7 +384,7 @@
 	break;
       }
       case 'P': {
-	unsigned int num, i;
+	unsigned int num;
 	if (sscanf (buf + 2, "%d", &num) == 1)
 	  {
 	    all_processes = malloc(num * sizeof(struct process));
@@ -394,7 +395,7 @@
       case 'p': {
 	unsigned int num, i;
 	char process[30];
-	if (sscanf (buf + 2, "%s %d", &process, &num) == 2)
+	if (sscanf (buf + 2, "%s %d", process, &num) == 2)
 	  {
 	    all_processes[process_counter].name = strdup(process);
 	    all_processes[process_counter].commands = malloc(num * sizeof(unsigned int));
@@ -454,7 +455,7 @@
   all_commands[idx].done = 1;
 }
 
-static void worker_thread(void *ptr)
+static void *worker_thread(void *ptr)
 {
   unsigned int idx;
   unsigned int todo_idx = 0;
@@ -490,7 +491,7 @@
 		  all_processes[todo_queue[min_queue]].command_count)
 		{
 		  int s2 = todo_queue_fd[min_queue], i;
-		  printf("finished %d\n", s2);
+		  //printf("finished %d\n", s2);
 		  send(s2, "ok", 2, 0);
 		  close(s2);
 		  for (i = min_queue+1; i < todo_queue_size; ++i)
@@ -507,6 +508,8 @@
 	do_command(idx++);
       }
     }
+  printf("unlink\n");
+  unlink("/dev/shm/preload_sock");
   exit(0);
 }
 
@@ -565,13 +568,23 @@
 	int len;
 
 	in_sock = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (in_sock < 0) {
+		perror("socket");
+		exit(1);
+	}
 
 	local.sun_family = AF_UNIX;  /* local is declared before socket() ^ */
-	strcpy(local.sun_path, "/var/run/preload");
+	strcpy(local.sun_path, "/dev/shm/preload_sock");
 	unlink(local.sun_path);
 	len = strlen(local.sun_path) + sizeof(local.sun_family);
-	bind(in_sock, (struct sockaddr *)&local, len);
-	listen(in_sock, 5);
+	if (bind(in_sock, (struct sockaddr *)&local, len)) {
+		perror("bind");
+		exit(1);
+	}
+	if (listen(in_sock, 5)) {
+		perror("listen");
+		exit(1);
+	}
 
 	daemon(0, 1);
 	pthread_create(&worker, NULL, worker_thread, NULL);
@@ -600,9 +613,13 @@
 	      {
 		unsigned len = sizeof(struct sockaddr_un);
 		int s2 = accept(in_sock, &remote, &len);
+		if (s2 < 0) {
+			perror("accept");
+			return 1;
+		}
 		char buffer[20];
 		size_t ret = read(s2, buffer, sizeof(buffer) - 1);
-		int i;
+		uint i;
 		buffer[ret] = 0;
 		while (ret > 0 && (buffer[ret-1] == '\n' || buffer[ret-1] == ' ' ))
 		  ret--;
@@ -638,5 +655,7 @@
 	    printf ("Loaded %zd bytes\n", total_bytes);
 	    printf ("Stated %zd entries\n", total_stats);
 	  }
+	printf("unlinked sun\n");
+	unlink(local.sun_path);
 	return 0;
 }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/preload-client.c new/preload/preload-client.c
--- old/preload/preload-client.c	2009-01-29 14:08:20.000000000 +0100
+++ new/preload/preload-client.c	2009-03-25 21:47:16.000000000 +0100
@@ -1,12 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
     
-#define SOCK_PATH "/var/run/preload"
+#define SOCK_PATH "/dev/shm/preload_sock"
 
 int main(int argc, char **argv)
 {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/prepare_preload new/preload/prepare_preload
--- old/preload/prepare_preload	2009-01-30 21:43:11.000000000 +0100
+++ new/preload/prepare_preload	2009-03-25 15:15:45.000000000 +0100
@@ -102,6 +102,7 @@
      }
      #print "all $filecounter $command $file\n";
      $filecounter++;
+     #print STDERR "$file\n";
   }
 
   my $fid = $allfiles{$command . $file};
@@ -115,10 +116,11 @@
 sub add_command($$$$)
 {
   my ($time, $process, $command, $file) = @_;
+  #print STDERR "$time $process $command $file\n";
   return if ($file =~ m,^/proc/, || $file =~ m,^/sys/, || $file =~ m,^/dev/, || $file =~ m,^/tmp/, );
 
   if ($process =~ m,/startpar/,) {
-    if ($process =~ m,/startpar/([^/]*)/, ) {
+    if ($process =~ m,/startpar/([^/]*), ) {
       my $init = $1;
       if ($init eq "earlyxdm" || $init eq "xdm") {
 	if ($file eq "/etc/X11/xdm/sys.xsession") {
@@ -194,7 +196,7 @@
       } elsif ($syscall eq "fork" && $result >= 0 ) {
         $ppids{$result} = $pid;
 	$pwds{$result} = $pwds{$pid};
-	next;
+	#next;
       } else {
         $arg = make_abs($pwds{$pid}, $arg);
       }
@@ -225,10 +227,11 @@
       }
 
       next if ($arg =~ m,^/proc/, || $arg =~ m,^/sys/, || $arg =~ m,^/dev/,);
-      next if (grep(/^$syscall/, ("mkdir", "chown32", "chown", "unlink", "chmod", "mknod", "statfs", "rename", "rmdir", "link", "getcwd", "creat","close", "fork")));
+      next if (grep(/^$syscall$/, ("mkdir", "chown32", "chown", "unlink", "chmod", "mknod", "statfs", "rename", "rmdir", "link", "getcwd", "creat","close", "fork")));
       next if ($ptree =~ m,bootchartd,);
       next if ($ptree =~ m,preload,);
 
+      #print "$ptree $syscall $line\n";
       if ($syscall eq 'open' || $syscall eq 'failedopen') {
 	add_command($time, $ptree, "stat", $arg);
       } elsif ($syscall eq 'execve') {
@@ -256,7 +259,7 @@
         $fds{$pid}->{$result} = $file;
 	add_command($time, $ptree, "open", $file);
       } else {
-        print STDERR "unknown $syscall $line\n";
+        print STDERR "unknown $ptree $syscall $line\n";
 	$unknown_calls{$syscall} = 1;
       }
     } else {
@@ -299,7 +302,7 @@
 	    $stat_files{$f} = 1;
 	  } elsif ($block eq 't') {
 	    if (exists $file2blocks{$f}) {
-	      printf "Huh?  $f has tail _and_ normal blocks.\n";
+	      printf STDERR "Huh?  $f has tail _and_ normal blocks.\n";
 	    } else {
 	      $small_files{$f} = 1;
 	    }
@@ -391,7 +394,7 @@
   @ordered = sort { $file2stat{$a}->dev <=> $file2stat{$b}->dev
   		    || $file2stat{$a}->ino <=> $file2stat{$b}->ino } @ordered;
   foreach my $f (@ordered) {
-    #print "$f: ". $file2stat{$f}->dev . ":" . $file2stat{$f}->ino . "\n";
+    #print STDERR "$f: ". $file2stat{$f}->dev . ":" . $file2stat{$f}->ino . "\n";
     if (exists $small_files{$f}) {
       print "W $f\n";  # W == read Whole file
     } elsif (exists $stated_alldirs{$f}) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/rpm/preload.spec new/preload/rpm/preload.spec
--- old/preload/rpm/preload.spec	2008-10-22 13:41:12.000000000 +0200
+++ new/preload/rpm/preload.spec	1970-01-01 01:00:00.000000000 +0100
@@ -1,214 +0,0 @@
-#
-# spec file for package preload (Version 0.2)
-#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-
-Name:           preload
-Version:        0.2
-Release:        182
-Summary:        Preloads Files into System Cache for Faster Booting
-License:        GPL v2 or later
-Group:          System/Boot
-Source0:        preload.tar.bz2
-Source1:        %name-rpmlintrc
-# svn export http://prefetch.googlecode.com/svn/trunk/ext3remapper
-Source3:        ext3remapper-r129.tar.bz2
-Patch0:         ext3remapper-r129.diff
-Source4:        boot.blktrace
-Source5:        stopblktrace
-Source6:        bootfaster.diff
-Source7:        waitfornm
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  blktrace e2fsprogs-devel update-desktop-files
-PreReq:         %fillup_prereq %insserv_prereq
-Requires:       cron
-Requires(post): blktrace
-
-%description
-Preload lists files to load into the system cache. This shortens system
-boot time if used correctly.
-
-
-
-Authors:
---------
-    Robert Love <rml@ximian.com>
-    Chris Mason <mason@suse.de>
-    Stephan Kulow <coolo@suse.de>
-    Michael Matz <matz@suse.de>
-
-%prep
-%setup -n preload -a 3
-%patch -p0
-
-%build
-gcc $RPM_OPT_FLAGS -W -Wall -DUSE_FADVISE -o preload preload.c
-gcc $RPM_OPT_FLAGS -W -Wall -o print-bmap print-bmap.c
-make -C ext3remapper-r129 "CC=gcc $RPM_OPT_FLAGS"
-
-%install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-for prog in e2block2file e2remapblocks preloadblocks; do
-   install -m755 ext3remapper-r129/$prog $RPM_BUILD_ROOT%_bindir
-done
-mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-install -m 755 preload $RPM_BUILD_ROOT/sbin
-install -m 755 print-bmap $RPM_BUILD_ROOT/sbin
-install -m 755 update_preload $RPM_BUILD_ROOT/usr/bin
-install -m 755 bootcache $RPM_BUILD_ROOT/usr/sbin
-install -m 755 prepare_preload $RPM_BUILD_ROOT/usr/bin
-install -m 755 init.earlyxdm $RPM_BUILD_ROOT/etc/init.d/earlyxdm
-install -m 755 %{S:4} $RPM_BUILD_ROOT/etc/init.d/
-install -m 755 %{S:5} $RPM_BUILD_ROOT/etc/init.d/
-install -m 755 %{S:7} $RPM_BUILD_ROOT/etc/init.d/
-mkdir -p $RPM_BUILD_ROOT/etc
-cp -a preload.d $RPM_BUILD_ROOT/etc
-pushd $RPM_BUILD_ROOT/etc/preload.d
-for i in *; do
-  sed -i -e 's,lib64,%{_lib},g' $i
-done
-popd
-install -m 755 cron $RPM_BUILD_ROOT/etc/cron.daily/suse.de-update-preload
-# empty dir
-mkdir -p $RPM_BUILD_ROOT/var/cache/preload
-mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/autostart
-install -m 644 appspreload.desktop $RPM_BUILD_ROOT/opt/kde3/share/autostart
-install -m 755 appspreloader.sh $RPM_BUILD_ROOT/usr/bin
-%suse_update_desktop_file -n $RPM_BUILD_ROOT/opt/kde3/share/autostart/appspreload.desktop
-cp %{S:6} .
-
-%post
-%{fillup_and_insserv -nY preload earlyxdm}
-%{fillup_and_insserv -nY preload boot.blktrace}
-%{fillup_and_insserv -nY preload stopblktrace}
-
-%postun
-%{insserv_cleanup}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-, root, root)
-%doc bootfaster.diff
-/sbin/*
-/usr/sbin/*
-/usr/bin/*
-/etc/cron.daily/suse.de-update-preload
-%dir /etc/preload.d
-%config /etc/preload.d/*
-/etc/init.d/*
-/var/cache/preload
-/opt/kde3
-
-%changelog
-* Sat Aug 23 2008 aj@suse.de
-- Fix init scripts.
-- Fix fillup call.
-* Tue Aug 12 2008 coolo@suse.de
-- now fixing differently for different checks ;(
-* Mon Aug 11 2008 coolo@suse.de
-- fix rpmlint warnings about init scripts
-* Mon May 12 2008 coolo@suse.de
-- update the preload lists (bnc#375313)
-* Wed Nov 07 2007 coolo@suse.de
-- fix nfs mount catch (#333688)
-* Fri Nov 02 2007 coolo@suse.de
-- adding correct Prereqs
-* Fri Sep 21 2007 coolo@suse.de
-- removing temporary files from file lists (#309149)
-* Tue Sep 11 2007 coolo@suse.de
-- make earlyxdm depend on haldaemon, so that we don't get a race condition.
-  It's far from optimal (#309171)
-* Mon Sep 03 2007 coolo@suse.de
-- update preload lists for cursor change (uncommited changes)
-- revert the workaround for #302010 now that we have a fix
-* Thu Aug 30 2007 aj@suse.de
-- Fix waitfornm typo (#305757).
-* Sun Aug 26 2007 jblunck@suse.de
-- Remove blktrace since this is in a separate package now
-* Tue Aug 21 2007 ro@suse.de
-- fix typo
-* Tue Aug 21 2007 dmueller@suse.de
-- readd kbd dependency as a kludge for (#302010)
-* Wed Jul 04 2007 coolo@suse.de
-- adding experimental support for ext2remapper
-* Thu Jun 21 2007 coolo@suse.de
-- remove kbd check - it's from the old earlykdm
-* Wed Jun 20 2007 coolo@suse.de
-- harmonize earlykdm and earlygdm into earlyxdm
-* Mon Jun 18 2007 coolo@suse.de
-- remove the boot scripts
-* Sat Jun 16 2007 coolo@suse.de
-- reduce some files
-* Thu Jun 14 2007 coolo@suse.de
-- update gdm file too
-* Fri Apr 20 2007 matz@suse.de
-- Fix off-by-one (#260836).
-* Fri Apr 20 2007 coolo@suse.de
-- update from SVN with updated file lists (#237120)
-* Sat Nov 25 2006 olh@suse.de
-- boot.preload has no hard requirement for boot.klog
-  change insserv dependencies from Required-start to Should-start
-  scripts will still get the right ordering that way without
-  triggering insserv and rpm post errors.
-* Mon Mar 20 2006 matz@suse.de
-- Handle fifo gracefully.  (#158734)
-- Integrate preload-gnome-session-files.diff into tarball.
-* Thu Mar 16 2006 federico@novell.com
-- Updated preload-gnome-session-files.diff to preload all the files which
-  a GNOME session opens during login.
-* Sat Mar 11 2006 federico@novell.com
-- Added preload-gnome-session-files.diff with a bunch of files needed
-  for a GNOME session.  This reduces cold login time from about 30
-  sec. to about 12 sec.
-* Thu Feb 09 2006 matz@suse.de
-- Accept a cache file, update it via cron.daily if necessary.
-* Thu Feb 09 2006 coolo@suse.de
-- don't hang on boot in opening stale unix domain sockets
-* Tue Feb 07 2006 ro@suse.de
-- fix typo in boot.preload (klogd vs klog)
-* Tue Feb 07 2006 coolo@suse.de
-- avoid loop between boot.localfs and boot.preload_early
-* Mon Feb 06 2006 coolo@suse.de
-- streamline patches with SVN
-- do not wait for update_preload (#117023)
-* Thu Feb 02 2006 rodrigo@suse.de
-- Added preload-gdm.patch to preload some basic GNOME processes.
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Tue Jan 24 2006 aj@suse.de
-- boot.coldplug does not exist anymore (#144652).
-* Thu Nov 10 2005 rml@suse.de
-- Newest SVN snapshot, with gdm config
-* Thu Nov 10 2005 coolo@suse.de
-- adoption to new fontconfig file names
-* Thu Aug 25 2005 matz@suse.de
-- Don't be verbose anymore.
-* Tue Aug 23 2005 coolo@suse.de
-- new lists
-* Mon Aug 22 2005 coolo@suse.de
-- reworked majorly
-* Wed Jan 26 2005 coolo@suse.de
-- clean out the lists a bit
-* Mon Jan 10 2005 coolo@suse.de
-- initial package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/rpm/update_rpm new/preload/rpm/update_rpm
--- old/preload/rpm/update_rpm	2005-11-10 21:45:39.000000000 +0100
+++ new/preload/rpm/update_rpm	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-opwd=$PWD
-tdir=`mktemp -d`
-cd $tdir || exit 1
-svn export http://svn.suse.de/svn/desktop/trunk/preload
-tar -cvj --exclude=rpm -f $opwd/preload.tar.bz2 preload
-cp -p preload/rpm/preload.spec $opwd/
-cd /
-rm -rf $tdir
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/stap/Makefile new/preload/stap/Makefile
--- old/preload/stap/Makefile	2009-02-06 12:36:25.000000000 +0100
+++ new/preload/stap/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-all:
-	stap -p 4 -DMAXSTRINGSIZE=300 -DMAXSKIPPED=2000 -m preloadtrace preloadtrace.stp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/preload/stap/preloadtrace.stp new/preload/stap/preloadtrace.stp
--- old/preload/stap/preloadtrace.stp	2009-02-06 12:36:25.000000000 +0100
+++ new/preload/stap/preloadtrace.stp	2009-02-07 18:23:26.000000000 +0100
@@ -60,7 +60,7 @@
   if (!file_ignored(user_string($filename))) {
      println(process_indent() . "open(\"" . user_string($filename) . "\") = " . sprint(fd))
   } else {
-     fdstoignore[fd] = 1
+     fdstoignore[pid(), fd] = 1
   }
 }
 
@@ -86,7 +86,7 @@
 }
 
 probe syscall.fstat.return {
-    if (fdstoignore[$fd] == 1) next
+    if (fdstoignore[pid(), $fd] == 1) next
     println(process_indent() . sprintf("fstat(%d) = ", $fd) . retstr )
 }
 
@@ -105,7 +105,7 @@
 %)
 #        print(process_indent() . " mmap " . sprintf("%d", $fd) . "\n")
 	if ($fd >= 0) { 
-	  if (readfrom[pid(), $fd] != 1 && fdstoignore[$fd] != 1 ) {
+	  if (readfrom[pid(), $fd] != 1 && fdstoignore[pid(), $fd] != 1 ) {
 		println(process_indent() . sprintf("read(%d)", $fd))
           }
           readfrom[pid(), $fd] = 1
@@ -114,7 +114,7 @@
 
 probe syscall.read {
 #        print(process_indent() . " read " . sprintf("%d", $fd) . "\n")
-          if (readfrom[pid(), $fd] != 1  && fdstoignore[$fd] != 1 ) {
+          if (readfrom[pid(), $fd] != 1  && fdstoignore[pid(), $fd] != 1 ) {
                 println(process_indent() . sprintf("read(%d)", $fd))
           }
 	readfrom[pid(), $fd] = 1
@@ -123,7 +123,7 @@
 probe syscall.close {
 #    println(process_indent() . sprintf("close(%d) = %d", $fd, readfrom[pid(), $fd]) )
     delete readfrom[pid(), $fd]
-    delete fdstoignore[$fd]
+    delete fdstoignore[pid(), $fd]
 }
 
 global tmparray
@@ -134,6 +134,11 @@
         if (_pid == pid()) tmparray[fd] = 1
     }
     foreach (fd in tmparray) { delete readfrom[pid(), fd] }
+    foreach ([_pid, fd] in fdstoignore) {
+        if (_pid == pid()) tmparray[fd] = 1
+    }
+    foreach (fd in tmparray) { delete fdstoignore[pid(), fd] }
+
 }
 
 #probe syscall.nanosleep {


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)