From owner-p4-projects@FreeBSD.ORG Thu Sep 17 21:06:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF1431065694; Thu, 17 Sep 2009 21:05:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3A44106568F for ; Thu, 17 Sep 2009 21:05:59 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A1358FC0C for ; Thu, 17 Sep 2009 21:05:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HL5xSk052573 for ; Thu, 17 Sep 2009 21:05:59 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HL5xW9052571 for perforce@freebsd.org; Thu, 17 Sep 2009 21:05:59 GMT (envelope-from jkim@freebsd.org) Date: Thu, 17 Sep 2009 21:05:59 GMT Message-Id: <200909172105.n8HL5xW9052571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 168638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2009 21:06:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=168638 Change 168638 by jkim@jkim_hammer on 2009/09/17 21:05:30 Implement kenv(2) support. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#20 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#42 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#18 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#20 (text+ko) ==== @@ -257,6 +257,7 @@ DECL_TEMPLATE(freebsd, sys_symlinkat); DECL_TEMPLATE(freebsd, sys_unlinkat); DECL_TEMPLATE(freebsd, sys_posix_openpt); +DECL_TEMPLATE(freebsd, sys_kenv); DECL_TEMPLATE(freebsd, sys_uuidgen); DECL_TEMPLATE(freebsd, sys_thr_new); DECL_TEMPLATE(freebsd, sys_thr_kill); ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#42 (text+ko) ==== @@ -2548,6 +2548,39 @@ PRE_REG_READ0(long, "lkmnosys8"); } +PRE(sys_kenv) +{ + PRINT("sys_kenv ( %ld, %#lx, %#lx, %ld )", ARG1,ARG2,ARG3,ARG4); + PRE_REG_READ4(long, "kenv", + int, action, const char *, name, char *, value, int, len); + switch (ARG1) { + case VKI_KENV_GET: + case VKI_KENV_SET: + case VKI_KENV_UNSET: + PRE_MEM_RASCIIZ("kenv(name)", ARG2); + /* FALLTHROUGH */ + case VKI_KENV_DUMP: + break; + default: + I_die_here; + } +} + +POST(sys_kenv) +{ + if (SUCCESS) { + switch (ARG1) { + case VKI_KENV_GET: + POST_MEM_WRITE(ARG3, ARG4); + break; + case VKI_KENV_DUMP: + if (ARG3 != (Addr)NULL) + POST_MEM_WRITE(ARG3, ARG4); + break; + } + } +} + PRE(sys_uuidgen) { PRINT("sys_uuidgen ( %#lx, %ld )", ARG1,ARG2); @@ -3667,7 +3700,7 @@ // __mac_set_fd 388 // __mac_set_file 389 - // kenv 390 + BSDXY(__NR_kenv, sys_kenv), // 390 // lchflags 391 BSDXY(__NR_uuidgen, sys_uuidgen), // 392 ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#18 (text+ko) ==== @@ -1944,6 +1944,14 @@ #endif //---------------------------------------------------------------------- +// From sys/kenv.h +//---------------------------------------------------------------------- +#define VKI_KENV_GET 0 +#define VKI_KENV_SET 1 +#define VKI_KENV_UNSET 2 +#define VKI_KENV_DUMP 3 + +//---------------------------------------------------------------------- // From sys/sysctl.h (and related) //----------------------------------------------------------------------