[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnumach] 02/03: Add task_set_name RPC.
From: |
Samuel Thibault |
Subject: |
[gnumach] 02/03: Add task_set_name RPC. |
Date: |
Thu, 20 Mar 2014 02:27:00 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository gnumach.
commit 1a66e8c4ba9672f1b3a8c6f36a04327d8fac0c2a
Author: Samuel Thibault <address@hidden>
Date: Thu Mar 20 02:25:19 2014 +0000
Add task_set_name RPC.
* patches/git-task_set_name.patch: New patch from git to add task_set_name
RPC.
* patches/90-fix_headers.patch: New patch to fix gnumach.defs build.
* rules: Remove generated doc files.
---
debian/changelog | 2 +
debian/patches/90-fix_headers.patch | 20 ++++++++
debian/patches/git-task_set_name.patch | 88 +++++++++++++++++++++++++++++++++-
debian/patches/series | 1 +
debian/rules | 1 +
5 files changed, 111 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 9e5904f..a802093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gnumach (2:1.4-7) unstable; urgency=medium
* patches/git-task_set_name.patch: New patch from git to add task_set_name
RPC.
+ * patches/90-fix_headers.patch: New patch to fix gnumach.defs build.
+ * rules: Remove generated doc files.
-- Samuel Thibault <address@hidden> Wed, 19 Mar 2014 19:08:30 +0000
diff --git a/debian/patches/90-fix_headers.patch
b/debian/patches/90-fix_headers.patch
new file mode 100644
index 0000000..384f0a1
--- /dev/null
+++ b/debian/patches/90-fix_headers.patch
@@ -0,0 +1,20 @@
+Index: gnumach/Makefrag.am
+===================================================================
+--- gnumach.orig/Makefrag.am 2014-03-19 23:59:41.000000000 +0000
++++ gnumach/Makefrag.am 2014-03-20 00:19:32.000000000 +0000
+@@ -414,6 +414,15 @@
+ # mach_debug.defs mach_debug_types.defs mach_debug_types.h \
+ # pc_info.h vm_info.h slab_info.h)
+
++include_machdebugdir = $(includedir)/mach_debug
++include_machdebug_HEADERS = \
++ include/mach_debug/mach_debug_types.defs \
++ include/mach_debug/mach_debug_types.h \
++ include/mach_debug/ipc_info.h \
++ include/mach_debug/vm_info.h \
++ include/mach_debug/slab_info.h \
++ include/mach_debug/hash_info.h
++
+ # Other headers for the distribution. We don't install these, because the
+ # GNU C library has correct versions for users to use.
+ # other-sys-headers := types.h time.h reboot.h ioctl.h
diff --git a/debian/patches/git-task_set_name.patch
b/debian/patches/git-task_set_name.patch
index 3afd30d..c99ea95 100644
--- a/debian/patches/git-task_set_name.patch
+++ b/debian/patches/git-task_set_name.patch
@@ -1,3 +1,89 @@
+commit fe7cd805567e1f4d1ed92d87b216e2dc78249892
+Author: Justus Winter <address@hidden>
+Date: Sat Feb 1 02:02:02 2014 +0100
+
+ kern: add snprintf
+
+ * kern/printf.c (snprintf): New function.
+ * kern/printf.h (snprintf): New declaration.
+
+diff --git a/kern/printf.c b/kern/printf.c
+index af59d5a..ea78d48 100644
+--- a/kern/printf.c
++++ b/kern/printf.c
+@@ -615,6 +615,16 @@ vsnprintf(char *buf, size_t size, const char *fmt,
va_list args)
+ return cookie.index;
+ }
+
++int
++snprintf(char *buf, size_t size, const char *fmt, ...)
++{
++ int written;
++ va_list listp;
++ va_start(listp, fmt);
++ written = vsnprintf(buf, size, fmt, listp);
++ va_end(listp);
++ return written;
++}
+
+ void safe_gets(str, maxlen)
+ char *str;
+diff --git a/kern/printf.h b/kern/printf.h
+index 8b4e760..0f8b328 100644
+--- a/kern/printf.h
++++ b/kern/printf.h
+@@ -40,6 +40,7 @@ extern void printnum (unsigned long u, int base,
+ vm_offset_t putc_arg);
+
+ extern int sprintf (char *buf, const char *fmt, ...);
++extern int snprintf (char *buf, size_t size, const char *fmt, ...);
+ extern int vsnprintf (char *buf, size_t size, const char *fmt, va_list args);
+
+ extern int printf (const char *fmt, ...);
+
+commit 7353f589daccb7fb61880d6994f6471e103da902
+Author: Justus Winter <address@hidden>
+Date: Sat Feb 1 02:09:02 2014 +0100
+
+ include: add a fixed-size string type for debugging purposes
+
+ * include/mach/debug.defs: New file.
+ * include/mach/debug.h: Likewise.
+
+diff --git a/include/mach_debug/mach_debug_types.defs
b/include/mach_debug/mach_debug_types.defs
+index f60125a..d24b6f9 100644
+--- a/include/mach_debug/mach_debug_types.defs
++++ b/include/mach_debug/mach_debug_types.defs
+@@ -57,6 +57,8 @@ type vm_page_info_array_t = array[] of vm_page_info_t;
+
+ type symtab_name_t = (MACH_MSG_TYPE_STRING_C, 8*32);
+
++type kernel_debug_name_t = c_string[*: 64];
++
+ import <mach_debug/mach_debug_types.h>;
+
+ #endif /* _MACH_DEBUG_MACH_DEBUG_TYPES_DEFS_ */
+diff --git a/include/mach_debug/mach_debug_types.h
b/include/mach_debug/mach_debug_types.h
+index 5d4efcd..9c7d1fd 100644
+--- a/include/mach_debug/mach_debug_types.h
++++ b/include/mach_debug/mach_debug_types.h
+@@ -37,4 +37,15 @@
+
+ typedef char symtab_name_t[32];
+
++/*
++ * A fixed-length string data type intended for names given to
++ * kernel objects.
++ *
++ * Note that it is not guaranteed that the in-kernel data
++ * structure will hold KERNEL_DEBUG_NAME_MAX bytes. The given
++ * name will be truncated to fit into the target data structure.
++ */
++#define KERNEL_DEBUG_NAME_MAX (64)
++typedef char kernel_debug_name_t[KERNEL_DEBUG_NAME_MAX];
++
+ #endif /* _MACH_DEBUG_MACH_DEBUG_TYPES_H_ */
+
commit df47f83ed98e4ce356af8d34de05b549f4f9c912
Author: Justus Winter <address@hidden>
Date: Sat Feb 1 02:15:05 2014 +0100
@@ -19,7 +105,7 @@ index 13b3c76..0b5a6f7 100644
+#include <kern/printf.h>
#include <kern/sched_prim.h> /* for thread_wakeup */
#include <kern/ipc_tt.h>
- #include <kern/syscall_emulation.h>
+ #include <vm/vm_kern.h> /* for kernel_map, ipc_kernel_map */
@@ -164,6 +165,8 @@ kern_return_t task_create(
}
#endif /* FAST_TAS */
diff --git a/debian/patches/series b/debian/patches/series
index edbebe0..09936fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ git-coverity-fixes.patch
git-mig-inlines.patch
git-quiet-cd-floppy.patch
git-task_set_name.patch
+90-fix_headers.patch
diff --git a/debian/rules b/debian/rules
index 9acaa1c..677d4e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,6 +147,7 @@ clean:
# Clean up autogenerated cruft
rm -rf autom4te.cache build-aux
rm -f aclocal.m4 config.h.in configure INSTALL Makefile.in
+ rm -f doc/mach.info* doc/stamp-vti doc/version.texi
find -name '*~' -o -name '*.rej' -o -name '*.orig' | xargs rm -f
rm -f debian/gnumach-image-*.preinst
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/gnumach.git