jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update version and patch for ioctls I happen to use

Browse Source
This commit is contained in:
Eric Andersen 2005-01-23 11:31:48 +00:00
parent e30cf26cff
commit 76adf60ddb
2 changed files with 157 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/valgrind/valgrind.mk
View File

@ -5,8 +5,8 @@
############################################################# #############################################################
VALGRIND_SITE:=http://developer.kde.org/~sewardj/ VALGRIND_SITE:=http://developer.kde.org/~sewardj/
VALGRIND_DIR:=$(BUILD_DIR)/valgrind-2.1.1 VALGRIND_DIR:=$(BUILD_DIR)/valgrind-2.2.0
VALGRIND_SOURCE:=valgrind-2.1.1.tar.bz2 VALGRIND_SOURCE:=valgrind-2.2.0.tar.bz2
$(DL_DIR)/$(VALGRIND_SOURCE): $(DL_DIR)/$(VALGRIND_SOURCE):
$(WGET) -P $(DL_DIR) $(VALGRIND_SITE)/$(VALGRIND_SOURCE) $(WGET) -P $(DL_DIR) $(VALGRIND_SITE)/$(VALGRIND_SOURCE)

185
package/valgrind/valgrind.patch
View File

@ -1,18 +1,78 @@
--- valgrind-2.1.1.orig/coregrind/vg_syscalls.c 2004-02-24 17:07:10.000000000 -0700 diff -urN y/valgrind-2.2.0/coregrind/vg_libpthread.c x/valgrind-2.2.0/coregrind/vg_libpthread.c
+++ valgrind-2.1.1/coregrind/vg_syscalls.c 2004-04-16 18:13:11.000000000 -0600 --- valgrind-2.2.0/coregrind/vg_libpthread.c 2004-08-29 15:02:27.000000000 -0600
@@ -3231,6 +3245,93 @@ +++ valgrind-2.2.0/coregrind/vg_libpthread.c 2005-01-21 03:42:19.000000000 -0700
@@ -3389,6 +3389,8 @@
pthread_mutex). So basically, this is completely broken on recent
glibcs. */
+#ifndef __UCLIBC__
+
#undef _IO_flockfile
void _IO_flockfile ( _IO_FILE * file )
{
@@ -3406,6 +3408,7 @@
weak_alias(_IO_funlockfile, funlockfile);
#endif
+#endif
/* This doesn't seem to be needed to simulate libpthread.so's external
interface, but many people complain about its absence. */
diff -urN y/valgrind-2.2.0/coregrind/vg_syscalls.c x/valgrind-2.2.0/coregrind/vg_syscalls.c
--- valgrind-2.2.0/coregrind/vg_syscalls.c 2004-08-30 18:08:37.000000000 -0600
+++ valgrind-2.2.0/coregrind/vg_syscalls.c 2005-01-21 03:49:05.000000000 -0700
@@ -3323,6 +3323,16 @@
break;
# endif /* BLKGETSIZE */
+ case BLKBSZSET:
+ SYSCALL_TRACK( pre_mem_write,tid, "ioctl(BLKBSZSET)", arg3,
+ sizeof(unsigned long));
+ break;
+ case BLKRAGET:
+ SYSCALL_TRACK( pre_mem_write,tid, "ioctl(BLKRAGET)", arg3,
+ sizeof(unsigned long));
+ break;
+ case BLKRASET:
+ break;
/* Hard disks */
case HDIO_GET_IDENTITY: /* 0x030d */
SYSCALL_TRACK( pre_mem_write,tid, "ioctl(HDIO_GET_IDENTITY)", arg3,
@@ -3375,6 +3385,7 @@
break;
/* The following two are probably bogus (should check args
for readability). JRS 20021117 */
+ case CDROMEJECT:
case CDROM_DRIVE_STATUS: /* 0x5326 */
case CDROM_CLEAR_OPTIONS: /* 0x5321 */ case CDROM_CLEAR_OPTIONS: /* 0x5321 */
break; break;
@@ -3383,10 +3394,12 @@
SYSCALL_TRACK( pre_mem_write,tid, "ioctl(FIGETBSZ)", arg3,
sizeof(unsigned long));
break;
+#if 0
case FIBMAP:
SYSCALL_TRACK( pre_mem_read,tid, "ioctl(FIBMAP)", arg3,
sizeof(unsigned long));
break;
+#endif
#ifdef HAVE_LINUX_FB_H
case FBIOGET_VSCREENINFO: /* 0x4600 */
@@ -3483,6 +3496,88 @@
sizeof(struct timeval) );
break;
+ /* Stuff added by Erik Andersen for general device probing/handling */
+#define BLKSSZGET _IO(0x12,104) +#define BLKSSZGET _IO(0x12,104)
+ case BLKSSZGET: + case BLKSSZGET:
+ SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKSSZGET)", arg3, + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKSSZGET)", arg3,
+ sizeof(int)); + sizeof(int));
+ break; + break;
+#ifndef BLKGETSIZE64
+#undef _IOR +#undef _IOR
+#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) +#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size))
+#define BLKGETSIZE64 _IOR(0x12,114,sizeof(uint64_t)) +#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+#endif
+ case BLKGETSIZE64: + case BLKGETSIZE64:
+ SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKGETSIZE64)", arg3, + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKGETSIZE64)", arg3,
+ sizeof(uint64_t)); + sizeof(uint64_t));
@ -31,12 +91,6 @@
+ sizeof(struct hd_geometry)); + sizeof(struct hd_geometry));
+ } + }
+ break; + break;
+#define HDIO_GET_IDENTITY 0x030d /* get IDE identification info */
+#define struct_hd_driveid_size 256 /* ATA6 specifies words 0-255 */
+ case HDIO_GET_IDENTITY:
+ SYSCALL_TRACK( pre_mem_write, tid, "ioctl(HDIO_GET_IDENTITY)", arg3,
+ struct_hd_driveid_size);
+ break;
+#define SCSI_IOCTL_GET_IDLUN 0x5382 +#define SCSI_IOCTL_GET_IDLUN 0x5382
+ case SCSI_IOCTL_GET_IDLUN: + case SCSI_IOCTL_GET_IDLUN:
+ { + {
@ -59,16 +113,16 @@
+#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386 +#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386
+ case SCSI_IOCTL_GET_BUS_NUMBER: + case SCSI_IOCTL_GET_BUS_NUMBER:
+ SYSCALL_TRACK( pre_mem_write, tid, "ioctl(SCSI_IOCTL_GET_BUS_NUMBER)", arg3, + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(SCSI_IOCTL_GET_BUS_NUMBER)", arg3,
+ sizeof(int)); + sizeof(long));
+ break; + break;
+#define SCSI_IOCTL_PROBE_HOST 0x5385 +#define SCSI_IOCTL_PROBE_HOST 0x5385
+ case SCSI_IOCTL_PROBE_HOST: + case SCSI_IOCTL_PROBE_HOST:
+ { + {
+ int xxxx; + unsigned long xxxx;
+ char *array = (char*)arg3; + char *array = (char*)arg3;
+ xxxx = array[0] + (array[1]<<8) + (array[2]<<16) + (array[3]<<24); + xxxx = array[0] + (array[1]<<8) + (array[2]<<16) + (array[3]<<24);
+ SYSCALL_TRACK( pre_mem_write, tid, "ioctl(SCSI_IOCTL_PROBE_HOST)", arg3, + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(SCSI_IOCTL_PROBE_HOST)", arg3,
+ sizeof(int)); + sizeof(unsigned long));
+ } + }
+ break; + break;
+#define BLKFLSBUF _IO(0x12,97) +#define BLKFLSBUF _IO(0x12,97)
@ -94,22 +148,93 @@
/* We don't have any specific information on it, so /* We don't have any specific information on it, so
try to do something reasonable based on direction and try to do something reasonable based on direction and
size bits. The encoding scheme is described in size bits. The encoding scheme is described in
--- valgrind-2.1.1.orig/coregrind/vg_libpthread.c 2004-03-08 08:57:17.000000000 -0700 @@ -3519,12 +3614,16 @@
+++ valgrind-2.1.1/coregrind/vg_libpthread.c 2004-04-16 17:58:31.000000000 -0600 "guidance on writing a proper wrapper." );
@@ -3175,6 +3175,8 @@ }
pthread_mutex). So basically, this is completely broken on recent } else {
glibcs. */ - if ((dir & _IOC_WRITE) && size > 0)
+ if ((dir & _IOC_WRITE) && size > 0) {
+#ifndef __UCLIBC__ + VG_(message)(Vg_UserMsg, "genric ioctl 0x%x", arg2);
+ SYSCALL_TRACK( pre_mem_read,tid, "ioctl(generic)",
#undef _IO_flockfile arg3, size);
void _IO_flockfile ( _IO_FILE * file ) - if ((dir & _IOC_READ) && size > 0)
{ + }
@@ -3192,6 +3194,7 @@ + if ((dir & _IOC_READ) && size > 0) {
weak_alias(_IO_funlockfile, funlockfile); + VG_(message)(Vg_UserMsg, "genric ioctl 0x%x", arg2);
#endif SYSCALL_TRACK( pre_mem_write,tid, "ioctl(generic)",
arg3, size);
+ }
}
break;
}
@@ -3874,6 +3973,18 @@
VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
break;
# endif /* BLKGETSIZE */
+ case BLKRAGET:
+ if (res == 0)
+ VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
+ break;
+ case BLKBSZSET:
+ if (res == 0)
+ VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
+ break;
+ case BLKBSZGET:
+ if (res == 0)
+ VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
+ break;
/* Hard disks */
case HDIO_GET_IDENTITY: /* 0x030d */
@@ -3897,7 +4008,8 @@
case CDROMPLAYMSF:
break;
/* The following two are probably bogus (should check args
- for readability). JRS 20021117 */
+ for readability). JRS 20021117 */
+ case CDROMEJECT:
case CDROM_DRIVE_STATUS: /* 0x5326 */
case CDROM_CLEAR_OPTIONS: /* 0x5321 */
break;
@@ -3906,10 +4018,12 @@
if (res == 0)
VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
break;
+#if 0
case FIBMAP:
if (res == 0)
VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
break;
+#endif +#endif
/* This doesn't seem to be needed to simulate libpthread.so's external #ifdef HAVE_LINUX_FB_H
interface, but many people complain about its absence. */ case FBIOGET_VSCREENINFO: //0x4600
@@ -3965,6 +4079,28 @@
VG_TRACK( post_mem_write, arg3, sizeof(struct timeval) );
break;
+ case SCSI_IOCTL_GET_IDLUN:
+ {
+ struct scsi_idlun
+ {
+ int mux4;
+ int host_unique_id;
+
+ };
+
+ VG_TRACK( post_mem_write, arg3, sizeof(struct scsi_idlun) );
+ }
+ break;
+ case SCSI_IOCTL_SEND_COMMAND:
+ VG_TRACK( post_mem_write, arg3, ((2 * sizeof(unsigned int)) + 6 + 512));
+ break;
+ case SCSI_IOCTL_GET_BUS_NUMBER:
+ VG_TRACK( post_mem_write, arg3, sizeof(long) );
+ break;
+ case SCSI_IOCTL_PROBE_HOST:
+ VG_TRACK( post_mem_write, arg3, sizeof(unsigned long) );
+ break;
+
/* We don't have any specific information on it, so
try to do something reasonable based on direction and
size bits. The encoding scheme is described in