CVS commit: xsrc/external/mit/xf86-video-tdfx/dist
Module Name:xsrc
Committed By: mrg
Date: Tue Mar 5 06:03:27 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_dri.c tdfx_driver.c
tdfx_priv.c
Removed Files:
xsrc/external/mit/xf86-video-tdfx/dist: README
Log Message:
merge xf86-video-tdfx 1.5.0.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-tdfx/dist/README
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.6 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.7
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.6 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c Tue Mar 5 06:03:27 2019
@@ -8,8 +8,6 @@
#include "xf86Pci.h"
#include "fb.h"
#include "miline.h"
-#include "GL/glxint.h"
-#include "GL/glxtokens.h"
#include "tdfx.h"
#include "tdfx_dri.h"
#include "tdfx_dripriv.h"
@@ -35,211 +33,6 @@ static void TDFXDRIMoveBuffers(WindowPtr
static void TDFXDRITransitionTo2d(ScreenPtr pScreen);
static void TDFXDRITransitionTo3d(ScreenPtr pScreen);
-static Bool
-TDFXInitVisualConfigs(ScreenPtr pScreen)
-{
- ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- TDFXPtr pTDFX = TDFXPTR(pScrn);
- int numConfigs = 0;
- __GLXvisualConfig *pConfigs = 0;
- TDFXConfigPrivPtr pTDFXConfigs = 0;
- TDFXConfigPrivPtr *pTDFXConfigPtrs = 0;
- int i, db, stencil, accum, depth;
-
- switch (pScrn->bitsPerPixel) {
- case 8:
- case 16:
-numConfigs = 16;
-
-if (!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
- numConfigs))) {
- return FALSE;
-}
-if (!(pTDFXConfigs = (TDFXConfigPrivPtr)calloc(sizeof(TDFXConfigPrivRec),
- numConfigs))) {
- free(pConfigs);
- return FALSE;
-}
-if (!(pTDFXConfigPtrs = (TDFXConfigPrivPtr*)calloc(sizeof(TDFXConfigPrivPtr),
- numConfigs))) {
- free(pConfigs);
- free(pTDFXConfigs);
- return FALSE;
-}
-for (i=0; icpp>2)
- pConfigs[i].depthSize = 24;
- else
- pConfigs[i].depthSize = 16;
- } else {
- pConfigs[i].depthSize = 0;
- }
- if (stencil)
- pConfigs[i].stencilSize = 8;
- else
- pConfigs[i].stencilSize = 0;
- pConfigs[i].auxBuffers = 0;
- pConfigs[i].level = 0;
- if (stencil || accum)
- pConfigs[i].visualRating = GLX_SLOW_CONFIG;
- else
- pConfigs[i].visualRating = GLX_NONE;
- pConfigs[i].transparentPixel = GLX_NONE;
- pConfigs[i].transparentRed = 0;
- pConfigs[i].transparentGreen = 0;
- pConfigs[i].transparentBlue = 0;
- pConfigs[i].transparentAlpha = 0;
- pConfigs[i].transparentIndex = 0;
- i++;
- }
- }
- }
-}
-if (i!=numConfigs) {
- xf86DrvMsg(pScreen->myNum, X_ERROR,
- "[dri] TDFXInitVisualConfigs: wrong number of visuals\n");
- return FALSE;
-}
-break; /* 16bpp */
-
- case 24:
- case 32:
-numConfigs = 8;
-
-pConfigs = (__GLXvisualConfig*) calloc(sizeof(__GLXvisualConfig), numConfigs);
-if (!pConfigs)
- return FALSE;
-
-pTDFXConfigs = (TDFXConfigPrivPtr) calloc(sizeof(TDFXConfigPrivRec), numConfigs);
-if (!pTDFXConfigs) {
- free(pConfigs);
- return FALSE;
-}
-
-pTDFXConfigPtrs = (TDFXConfigPrivPtr *) calloc(sizeof(TDFXConfigPrivPtr), numConfigs);
-if (!pTDFXConfigPtrs) {
- free(pConfigs);
- free(pTDFXConfigs);
- return FALSE;
-}
-
-for (i = 0; i < numConfigs; i++)
- pTDFXConfigPtrs[i] = [i];
-
-i=0;
-for (db = 0; db <=1; db++) {
- for (depth = 0; depth<=1; depth++) {
- /*stencil = depth;*/ /* Z and stencil share the same memory */
- for (accum = 0; accum <= 1; accum++) {
- /*for (stencil = 0; stencil <=1; stencil++) {*/
- stencil = depth;
- pConfigs[i].vid = -1;
- pConfigs[i].class = -1;
- pConfigs[i].rgba = TRUE;
- pConfigs[i].redSize = 8;
- pConfigs[i].greenSize = 8;
- pConfigs[i].blueSize = 8;
- pConfigs[i].alphaSize = (pScrn->bitsPerPixel==32) ? 8 : 0;
- pConfigs[i].redMask = 0x00ff;
- pConfigs[i].greenMask = 0xff00;
- pConfigs[i].blueMask = 0x00ff;
- pConfigs[i].alphaMask = (pScrn->bitsPerPixel==32) ? 0xff00 : 0;
- if (accum) {
- pConfigs[i].accumRedSize = 16;
- pConfigs[i].accumGreenSize = 16;
- pConfigs[i].accumBlueSize = 16;
- pConfigs[i].accumAlphaSize = (pScrn->bitsPerPixel==32) ? 16 : 0;
- } else {
- pConfigs[i].accumRedSize = 0;
-
CVS import: xsrc/external/mit/xf86-video-tdfx/dist
Module Name:xsrc Committed By: mrg Date: Tue Mar 5 06:02:53 UTC 2019 Update of /cvsroot/xsrc/external/mit/xf86-video-tdfx/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1391 Log Message: initial import of xf86-video-tdfx-1.5.0 Status: Vendor Tag: xorg Release Tags: xf86-video-tdfx-1-5-0 U xsrc/external/mit/xf86-video-tdfx/dist/aclocal.m4 U xsrc/external/mit/xf86-video-tdfx/dist/config.h.in U xsrc/external/mit/xf86-video-tdfx/dist/missing U xsrc/external/mit/xf86-video-tdfx/dist/config.sub U xsrc/external/mit/xf86-video-tdfx/dist/Makefile.in U xsrc/external/mit/xf86-video-tdfx/dist/INSTALL U xsrc/external/mit/xf86-video-tdfx/dist/Makefile.am U xsrc/external/mit/xf86-video-tdfx/dist/ltmain.sh U xsrc/external/mit/xf86-video-tdfx/dist/depcomp U xsrc/external/mit/xf86-video-tdfx/dist/compile U xsrc/external/mit/xf86-video-tdfx/dist/ChangeLog U xsrc/external/mit/xf86-video-tdfx/dist/configure.ac U xsrc/external/mit/xf86-video-tdfx/dist/configure U xsrc/external/mit/xf86-video-tdfx/dist/install-sh N xsrc/external/mit/xf86-video-tdfx/dist/README.md U xsrc/external/mit/xf86-video-tdfx/dist/COPYING U xsrc/external/mit/xf86-video-tdfx/dist/config.guess U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_sli.c C xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h C xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dga.c U xsrc/external/mit/xf86-video-tdfx/dist/src/Makefile.in U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dripriv.h U xsrc/external/mit/xf86-video-tdfx/dist/src/Makefile.am C xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_video.c C xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_hwcurs.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfxdefs.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_io.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_accel.c U xsrc/external/mit/xf86-video-tdfx/dist/man/Makefile.in U xsrc/external/mit/xf86-video-tdfx/dist/man/Makefile.am U xsrc/external/mit/xf86-video-tdfx/dist/man/tdfx.man 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-tdfx/dist
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Mar 5 03:49:06 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Add Intel I219 variations for Cannon Lake.
To generate a diff of this commit:
cvs rdiff -u -r1.630 -r1.631 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.630 src/sys/dev/pci/if_wm.c:1.631
--- src/sys/dev/pci/if_wm.c:1.630 Mon Mar 4 05:28:48 2019
+++ src/sys/dev/pci/if_wm.c Tue Mar 5 03:49:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.630 2019/03/04 05:28:48 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.631 2019/03/05 03:49:06 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.630 2019/03/04 05:28:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.631 2019/03/05 03:49:06 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1525,18 +1525,6 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_LM3,
"I218 LM Ethernet Connection",
WM_T_PCH_LPT, WMP_F_COPPER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V,
- "I219 V Ethernet Connection",
- WM_T_PCH_SPT, WMP_F_COPPER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2,
- "I219 V Ethernet Connection",
- WM_T_PCH_SPT, WMP_F_COPPER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4,
- "I219 V Ethernet Connection",
- WM_T_PCH_SPT, WMP_F_COPPER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V5,
- "I219 V Ethernet Connection",
- WM_T_PCH_SPT, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM,
"I219 LM Ethernet Connection",
WM_T_PCH_SPT, WMP_F_COPPER },
@@ -1552,17 +1540,41 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM5,
"I219 LM Ethernet Connection",
WM_T_PCH_SPT, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM6,
+ "I219 LM Ethernet Connection",
+ WM_T_PCH_CNP, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM7,
+ "I219 LM Ethernet Connection",
+ WM_T_PCH_CNP, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM8,
+ "I219 LM Ethernet Connection",
+ WM_T_PCH_CNP, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM9,
+ "I219 LM Ethernet Connection",
+ WM_T_PCH_CNP, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V,
+ "I219 V Ethernet Connection",
+ WM_T_PCH_SPT, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V2,
+ "I219 V Ethernet Connection",
+ WM_T_PCH_SPT, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4,
+ "I219 V Ethernet Connection",
+ WM_T_PCH_SPT, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V5,
+ "I219 V Ethernet Connection",
+ WM_T_PCH_SPT, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V6,
"I219 V Ethernet Connection",
WM_T_PCH_CNP, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V7,
"I219 V Ethernet Connection",
WM_T_PCH_CNP, WMP_F_COPPER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM6,
- "I219 LM Ethernet Connection",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V8,
+ "I219 V Ethernet Connection",
WM_T_PCH_CNP, WMP_F_COPPER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM7,
- "I219 LM Ethernet Connection",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V9,
+ "I219 V Ethernet Connection",
WM_T_PCH_CNP, WMP_F_COPPER },
{ 0, 0,
NULL,
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Mar 5 03:48:24 UTC 2019
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.1354 -r1.1355 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1353 -r1.1354 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1354 src/sys/dev/pci/pcidevs.h:1.1355
--- src/sys/dev/pci/pcidevs.h:1.1354 Wed Feb 20 07:47:34 2019
+++ src/sys/dev/pci/pcidevs.h Tue Mar 5 03:48:23 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1354 2019/02/20 07:47:34 msaitoh Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1355 2019/03/05 03:48:23 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1365 2019/02/20 07:47:11 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1366 2019/03/05 03:47:57 msaitoh Exp
*/
/*
@@ -3532,6 +3532,10 @@
#define PCI_PRODUCT_INTEL_I219_V5 0x15d6 /* I219-V Ethernet Connection */
#define PCI_PRODUCT_INTEL_I219_LM4 0x15d7 /* I219-LM Ethernet Connection */
#define PCI_PRODUCT_INTEL_I219_V4 0x15d8 /* I219-V Ethernet Connection */
+#define PCI_PRODUCT_INTEL_I219_LM8 0x15df /* I219-LM Ethernet Connection */
+#define PCI_PRODUCT_INTEL_I219_V8 0x15e0 /* I219-V Ethernet Connection */
+#define PCI_PRODUCT_INTEL_I219_LM9 0x15e1 /* I219-LM Ethernet Connection */
+#define PCI_PRODUCT_INTEL_I219_V9 0x15e2 /* I219-V Ethernet Connection */
#define PCI_PRODUCT_INTEL_I219_LM5 0x15e3 /* I219-LM Ethernet Connection */
#define PCI_PRODUCT_INTEL_C3K_X553_SGMII 0x15e4 /* C3000 X553 1GbE SGMII (10G SKU) */
#define PCI_PRODUCT_INTEL_C3K_X553_SGMII_L 0x15e5 /* C3000 X553 1GbE SGMII (non-10G SKU) */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1353 src/sys/dev/pci/pcidevs_data.h:1.1354
--- src/sys/dev/pci/pcidevs_data.h:1.1353 Wed Feb 20 07:47:34 2019
+++ src/sys/dev/pci/pcidevs_data.h Tue Mar 5 03:48:23 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1353 2019/02/20 07:47:34 msaitoh Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1354 2019/03/05 03:48:23 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1365 2019/02/20 07:47:11 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1366 2019/03/05 03:47:57 msaitoh Exp
*/
/*
@@ -5773,6 +5773,14 @@ static const uint16_t pci_products[] = {
22056, 5646, 20888, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V4,
22064, 5646, 20888, 0,
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM8,
+ 22056, 5646, 20888, 0,
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V8,
+ 22064, 5646, 20888, 0,
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM9,
+ 22056, 5646, 20888, 0,
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V9,
+ 22064, 5646, 20888, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM5,
22056, 5646, 20888, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C3K_X553_SGMII,
@@ -14358,7 +14366,7 @@ static const char pci_words[] = { "."
"ID\0" /* 1 refs @ 5629 */
"3c985\0" /* 1 refs @ 5632 */
"Gigabit\0" /* 125 refs @ 5638 */
- "Ethernet\0" /* 512 refs @ 5646 */
+ "Ethernet\0" /* 516 refs @ 5646 */
"3c996\0" /* 1 refs @ 5655 */
"10/100/1000\0" /* 49 refs @ 5661 */
"3c556\0" /* 2 refs @ 5673 */
@@ -16493,7 +16501,7 @@ static const char pci_words[] = { "."
"(AMT)\0" /* 3 refs @ 20865 */
"(IFE)\0" /* 1 refs @ 20871 */
"82801EB/ER\0" /* 10 refs @ 20877 */
- "Connection\0" /* 41 refs @ 20888 */
+ "Connection\0" /* 45 refs @ 20888 */
"M\0" /* 1 refs @ 20899 */
"i82571EB\0" /* 7 refs @ 20901 */
"82801FB\0" /* 4 refs @ 20910 */
@@ -16645,8 +16653,8 @@ static const char pci_words[] = { "."
"I218-V\0" /* 3 refs @ 22034 */
"I218-LM\0" /* 3 refs @ 22041 */
"Bypass\0" /* 2 refs @ 22049 */
- "I219-LM\0" /* 7 refs @ 22056 */
- "I219-V\0" /* 6 refs @ 22064 */
+ "I219-LM\0" /* 9 refs @ 22056 */
+ "I219-V\0" /* 8 refs @ 22064 */
"SFP+\0" /* 6 refs @ 22071 */
"KX\0" /* 3 refs @ 22076 */
"40GbE\0" /* 3 refs @ 22079 */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Mar 5 03:47:57 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel I219 variations for Cannon Lake. To generate a diff of this commit: cvs rdiff -u -r1.1365 -r1.1366 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1365 src/sys/dev/pci/pcidevs:1.1366 --- src/sys/dev/pci/pcidevs:1.1365 Wed Feb 20 07:47:11 2019 +++ src/sys/dev/pci/pcidevs Tue Mar 5 03:47:57 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1365 2019/02/20 07:47:11 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1366 2019/03/05 03:47:57 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3525,6 +3525,10 @@ product INTEL X550T1 0x15d1 X550 10G E product INTEL I219_V5 0x15d6 I219-V Ethernet Connection product INTEL I219_LM4 0x15d7 I219-LM Ethernet Connection product INTEL I219_V4 0x15d8 I219-V Ethernet Connection +product INTEL I219_LM8 0x15df I219-LM Ethernet Connection +product INTEL I219_V8 0x15e0 I219-V Ethernet Connection +product INTEL I219_LM9 0x15e1 I219-LM Ethernet Connection +product INTEL I219_V9 0x15e2 I219-V Ethernet Connection product INTEL I219_LM5 0x15e3 I219-LM Ethernet Connection product INTEL C3K_X553_SGMII 0x15e4 C3000 X553 1GbE SGMII (10G SKU) product INTEL C3K_X553_SGMII_L 0x15e5 C3000 X553 1GbE SGMII (non-10G SKU)
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Tue Mar 5 02:13:15 UTC 2019
Modified Files:
src/sys/dev/mii: tlphy.c
Log Message:
mii_phy_add_media() automatically install power handler, but if_media_add()
doesn't. When mii_phy_add_media() isn't used, call pmf_device_register().
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/mii/tlphy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/tlphy.c
diff -u src/sys/dev/mii/tlphy.c:1.64 src/sys/dev/mii/tlphy.c:1.65
--- src/sys/dev/mii/tlphy.c:1.64 Sun Feb 24 17:22:21 2019
+++ src/sys/dev/mii/tlphy.c Tue Mar 5 02:13:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tlphy.c,v 1.64 2019/02/24 17:22:21 christos Exp $ */
+/* $NetBSD: tlphy.c,v 1.65 2019/03/05 02:13:15 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.64 2019/02/24 17:22:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.65 2019/03/05 02:13:15 msaitoh Exp $");
#include
#include
@@ -180,12 +180,19 @@ tlphyattach(device_t parent, device_t se
if (sc->mii_capabilities & BMSR_MEDIAMASK) {
aprint_normal("%s", sep);
mii_phy_add_media(sc);
- } else if ((tsc->sc_tlphycap &
+ } else {
+ if ((tsc->sc_tlphycap &
(TLPHY_MEDIA_10_2 | TLPHY_MEDIA_10_5)) == 0)
- aprint_error("no media present");
- else if (!pmf_device_register(self, NULL, mii_phy_resume)) {
- aprint_normal("\n");
- aprint_error_dev(self, "couldn't establish power handler");
+ aprint_error("no media present");
+ /*
+ * mii_phy_add_media() automatically install power handler,
+ * but if_media_add() doesn't. Do it now.
+ */
+ if (!pmf_device_register(self, NULL, mii_phy_resume)) {
+ aprint_normal("\n");
+ aprint_error_dev(self,
+ "couldn't establish power handler");
+ }
}
aprint_normal("\n");
#undef ADD
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Tue Mar 5 01:35:52 UTC 2019
Modified Files:
src/lib/libc/thread-stub: thread-stub.c
src/lib/libpthread: pthread.c pthread_int.h pthread_tsd.c
Added Files:
src/lib/libc/include: tsd.h
Log Message:
Transfer all the keys that were created in the libc stub implementation
to the pthread tsd implementation when the main thread is created.
This corrects a problem where a process created keys before libpthread
was loaded (either from the libc constructor or because libpthread
was dlopened later). This fixes a problem with jemalloc which creates
keys in the constructor.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/lib/libc/include/tsd.h
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/thread-stub/thread-stub.c
cvs rdiff -u -r1.152 -r1.153 src/lib/libpthread/pthread.c
cvs rdiff -u -r1.94 -r1.95 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.16 -r1.17 src/lib/libpthread/pthread_tsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/thread-stub/thread-stub.c
diff -u src/lib/libc/thread-stub/thread-stub.c:1.28 src/lib/libc/thread-stub/thread-stub.c:1.29
--- src/lib/libc/thread-stub/thread-stub.c:1.28 Mon Oct 31 14:10:11 2016
+++ src/lib/libc/thread-stub/thread-stub.c Mon Mar 4 20:35:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: thread-stub.c,v 1.28 2016/10/31 18:10:11 kamil Exp $ */
+/* $NetBSD: thread-stub.c,v 1.29 2019/03/05 01:35:52 christos Exp $ */
/*-
* Copyright (c) 2003, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: thread-stub.c,v 1.28 2016/10/31 18:10:11 kamil Exp $");
+__RCSID("$NetBSD: thread-stub.c,v 1.29 2019/03/05 01:35:52 christos Exp $");
#endif /* LIBC_SCCS and not lint */
/*
@@ -47,6 +47,7 @@ __RCSID("$NetBSD: thread-stub.c,v 1.28 2
#define pthread_detach __libc_pthread_detach
#include "namespace.h"
#include "reentrant.h"
+#include "tsd.h"
#include
#include
@@ -280,13 +281,7 @@ __libc_rwlock_catchall_stub(rwlock_t *l)
* implementation, since some thread-safe libraries want to use it.
*/
-#define TSD_KEYS_MAX 64
-
-static struct {
- void *tsd_val;
- void (*tsd_dtor)(void *);
- int tsd_inuse;
-} __libc_tsd[TSD_KEYS_MAX];
+struct __libc_tsd __libc_tsd[TSD_KEYS_MAX];
static int __libc_tsd_nextkey;
__weak_alias(__libc_thr_keycreate,__libc_thr_keycreate_stub)
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.152 src/lib/libpthread/pthread.c:1.153
--- src/lib/libpthread/pthread.c:1.152 Sat Aug 18 22:10:42 2018
+++ src/lib/libpthread/pthread.c Mon Mar 4 20:35:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.152 2018/08/19 02:10:42 kamil Exp $ */
+/* $NetBSD: pthread.c,v 1.153 2019/03/05 01:35:52 christos Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread.c,v 1.152 2018/08/19 02:10:42 kamil Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.153 2019/03/05 01:35:52 christos Exp $");
#define __EXPOSE_STACK 1
@@ -1330,6 +1330,7 @@ pthread__initmainstack(void)
break;
}
}
+ pthread__copy_tsd(pthread__main);
}
/*
Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.94 src/lib/libpthread/pthread_int.h:1.95
--- src/lib/libpthread/pthread_int.h:1.94 Sun Jul 2 12:41:32 2017
+++ src/lib/libpthread/pthread_int.h Mon Mar 4 20:35:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.94 2017/07/02 16:41:32 joerg Exp $ */
+/* $NetBSD: pthread_int.h,v 1.95 2019/03/05 01:35:52 christos Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -290,6 +290,8 @@ pthread__self(void)
void *pthread_tsd_init(size_t *) PTHREAD_HIDE;
void pthread__destroy_tsd(pthread_t) PTHREAD_HIDE;
+void pthread__copy_tsd(pthread_t) PTHREAD_HIDE;
+
__dead void pthread__assertfunc(const char *, int, const char *, const char *)
PTHREAD_HIDE;
void pthread__errorfunc(const char *, int, const char *, const char *)
Index: src/lib/libpthread/pthread_tsd.c
diff -u src/lib/libpthread/pthread_tsd.c:1.16 src/lib/libpthread/pthread_tsd.c:1.17
--- src/lib/libpthread/pthread_tsd.c:1.16 Sun Jul 9 16:21:08 2017
+++ src/lib/libpthread/pthread_tsd.c Mon Mar 4 20:35:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_tsd.c,v 1.16 2017/07/09 20:21:08 christos Exp $ */
+/* $NetBSD: pthread_tsd.c,v 1.17 2019/03/05 01:35:52 christos Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread_tsd.c,v 1.16 2017/07/09 20:21:08 christos Exp $");
+__RCSID("$NetBSD: pthread_tsd.c,v 1.17 2019/03/05 01:35:52 christos Exp $");
/* Functions and structures dealing with thread-specific data */
#include
@@ -39,6 +39,7 @@ __RCSID("$NetBSD: pthread_tsd.c,v 1.16 2
#include
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: rin Date: Mon Mar 4 23:03:10 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libc minor To generate a diff of this commit: cvs rdiff -u -r1.857 -r1.858 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.217 -r1.218 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.857 src/distrib/sets/lists/base/shl.mi:1.858 --- src/distrib/sets/lists/base/shl.mi:1.857 Sun Feb 24 20:06:43 2019 +++ src/distrib/sets/lists/base/shl.mi Mon Mar 4 23:03:10 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.857 2019/02/24 20:06:43 christos Exp $ +# $NetBSD: shl.mi,v 1.858 2019/03/04 23:03:10 rin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -18,7 +18,7 @@ ./lib/libblacklist.so.0.0 base-sys-shlib dynamicroot ./lib/libc.so base-sys-shlib dynamicroot ./lib/libc.so.12base-sys-shlib dynamicroot -./lib/libc.so.12.211base-sys-shlib dynamicroot +./lib/libc.so.12.212base-sys-shlib dynamicroot ./lib/libcrypt.sobase-sys-shlib dynamicroot ./lib/libcrypt.so.1base-sys-shlib dynamicroot ./lib/libcrypt.so.1.0base-sys-shlib dynamicroot @@ -221,7 +221,7 @@ ./usr/lib/libc++.so.1.0base-sys-shlib compatfile,libcxx ./usr/lib/libc.sobase-sys-shlib compatfile ./usr/lib/libc.so.12base-sys-shlib compatfile -./usr/lib/libc.so.12.211 base-sys-shlib compatfile +./usr/lib/libc.so.12.212 base-sys-shlib compatfile ./usr/lib/libcdk.sobase-obsolete compatfile,obsolete ./usr/lib/libcom_err.sobase-krb5-shlib compatfile,kerberos ./usr/lib/libcom_err.so.8 base-krb5-shlib compatfile,kerberos Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.217 src/distrib/sets/lists/debug/shl.mi:1.218 --- src/distrib/sets/lists/debug/shl.mi:1.217 Sun Feb 24 20:06:43 2019 +++ src/distrib/sets/lists/debug/shl.mi Mon Mar 4 23:03:10 2019 @@ -1,8 +1,8 @@ -# $NetBSD: shl.mi,v 1.217 2019/02/24 20:06:43 christos Exp $ +# $NetBSD: shl.mi,v 1.218 2019/03/04 23:03:10 rin Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot -./usr/libdata/debug/lib/libc.so.12.211.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/lib/libc.so.12.212.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypto.so.12.0.debug comp-sys-debug debug,dynamicroot,openssl=10 ./usr/libdata/debug/lib/libcrypto.so.14.0.debug comp-sys-debug debug,dynamicroot,openssl=11 @@ -71,7 +71,7 @@ ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libc++.so.1.0.debug comp-sys-debug debug,compatfile,libcxx -./usr/libdata/debug/usr/lib/libc.so.12.211.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libc.so.12.212.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libcom_err.so.8.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libcrypto.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Mar 4 21:19:58 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch back amd64 to the old jemalloc. We have some pthread unit-tests
failing.
To generate a diff of this commit:
cvs rdiff -u -r1.1106 -r1.1107 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1106 src/share/mk/bsd.own.mk:1.1107
--- src/share/mk/bsd.own.mk:1.1106 Mon Mar 4 12:32:46 2019
+++ src/share/mk/bsd.own.mk Mon Mar 4 16:19:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1106 2019/03/04 17:32:46 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1107 2019/03/04 21:19:58 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -172,11 +172,7 @@ EXTERNAL_BINUTILS_SUBDIR= /does/not/exis
# What version of jemalloc we use (100 is the one
# built-in to libc from 2005 (pre version 3).
#
-.if ${MACHINE_CPU} == "x86_64"
-HAVE_JEMALLOC?= 510
-.else
HAVE_JEMALLOC?= 100
-.endif
.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:22:04 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: hash.h
Log Message:
Add FALLTHROUGH comments.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h:1.2 src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h:1.3
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h:1.2 Mon Mar 4 15:04:09 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h Mon Mar 4 15:22:04 2019
@@ -177,26 +177,29 @@ hash_x86_128(const void *key, const int
uint32_t k4 = 0;
switch (len & 15) {
- case 15: k4 ^= tail[14] << 16;
- case 14: k4 ^= tail[13] << 8;
+ case 15: k4 ^= tail[14] << 16; /*FALLTHROUGH*/
+ case 14: k4 ^= tail[13] << 8; /*FALLTHROUGH*/
case 13: k4 ^= tail[12] << 0;
k4 *= c4; k4 = hash_rotl_32(k4, 18); k4 *= c1; h4 ^= k4;
+ /*FALLTHROUGH*/
- case 12: k3 ^= tail[11] << 24;
- case 11: k3 ^= tail[10] << 16;
- case 10: k3 ^= tail[ 9] << 8;
+ case 12: k3 ^= tail[11] << 24; /*FALLTHROUGH*/
+ case 11: k3 ^= tail[10] << 16; /*FALLTHROUGH*/
+ case 10: k3 ^= tail[ 9] << 8; /*FALLTHROUGH*/
case 9: k3 ^= tail[ 8] << 0;
- k3 *= c3; k3 = hash_rotl_32(k3, 17); k3 *= c4; h3 ^= k3;
+ k3 *= c3; k3 = hash_rotl_32(k3, 17); k3 *= c4; h3 ^= k3;
+ /*FALLTHROUGH*/
- case 8: k2 ^= tail[ 7] << 24;
- case 7: k2 ^= tail[ 6] << 16;
- case 6: k2 ^= tail[ 5] << 8;
+ case 8: k2 ^= tail[ 7] << 24; /*FALLTHROUGH*/
+ case 7: k2 ^= tail[ 6] << 16; /*FALLTHROUGH*/
+ case 6: k2 ^= tail[ 5] << 8; /*FALLTHROUGH*/
case 5: k2 ^= tail[ 4] << 0;
k2 *= c2; k2 = hash_rotl_32(k2, 16); k2 *= c3; h2 ^= k2;
+ /*FALLTHROUGH*/
- case 4: k1 ^= tail[ 3] << 24;
- case 3: k1 ^= tail[ 2] << 16;
- case 2: k1 ^= tail[ 1] << 8;
+ case 4: k1 ^= tail[ 3] << 24; /*FALLTHROUGH*/
+ case 3: k1 ^= tail[ 2] << 16; /*FALLTHROUGH*/
+ case 2: k1 ^= tail[ 1] << 8; /*FALLTHROUGH*/
case 1: k1 ^= tail[ 0] << 0;
k1 *= c1; k1 = hash_rotl_32(k1, 15); k1 *= c2; h1 ^= k1;
}
CVS commit: src/external/bsd/jemalloc/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:21:18 UTC 2019
Modified Files:
src/external/bsd/jemalloc/include/jemalloc/internal: hash.h
Log Message:
Add fallthough comments.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/jemalloc/include/jemalloc/internal/hash.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/include/jemalloc/internal/hash.h
diff -u src/external/bsd/jemalloc/include/jemalloc/internal/hash.h:1.1 src/external/bsd/jemalloc/include/jemalloc/internal/hash.h:1.2
--- src/external/bsd/jemalloc/include/jemalloc/internal/hash.h:1.1 Mon Mar 4 12:25:09 2019
+++ src/external/bsd/jemalloc/include/jemalloc/internal/hash.h Mon Mar 4 15:21:18 2019
@@ -177,26 +177,29 @@ hash_x86_128(const void *key, const int
uint32_t k4 = 0;
switch (len & 15) {
- case 15: k4 ^= tail[14] << 16;
- case 14: k4 ^= tail[13] << 8;
+ case 15: k4 ^= tail[14] << 16; /*FALLTHROUGH*/
+ case 14: k4 ^= tail[13] << 8; /*FALLTHROUGH*/
case 13: k4 ^= tail[12] << 0;
k4 *= c4; k4 = hash_rotl_32(k4, 18); k4 *= c1; h4 ^= k4;
+ /*FALLTHROUGH*/
- case 12: k3 ^= tail[11] << 24;
- case 11: k3 ^= tail[10] << 16;
- case 10: k3 ^= tail[ 9] << 8;
+ case 12: k3 ^= tail[11] << 24; /*FALLTHROUGH*/
+ case 11: k3 ^= tail[10] << 16; /*FALLTHROUGH*/
+ case 10: k3 ^= tail[ 9] << 8; /*FALLTHROUGH*/
case 9: k3 ^= tail[ 8] << 0;
- k3 *= c3; k3 = hash_rotl_32(k3, 17); k3 *= c4; h3 ^= k3;
+ k3 *= c3; k3 = hash_rotl_32(k3, 17); k3 *= c4; h3 ^= k3;
+ /*FALLTHROUGH*/
- case 8: k2 ^= tail[ 7] << 24;
- case 7: k2 ^= tail[ 6] << 16;
- case 6: k2 ^= tail[ 5] << 8;
+ case 8: k2 ^= tail[ 7] << 24; /*FALLTHROUGH*/
+ case 7: k2 ^= tail[ 6] << 16; /*FALLTHROUGH*/
+ case 6: k2 ^= tail[ 5] << 8; /*FALLTHROUGH*/
case 5: k2 ^= tail[ 4] << 0;
k2 *= c2; k2 = hash_rotl_32(k2, 16); k2 *= c3; h2 ^= k2;
+ /*FALLTHROUGH*/
- case 4: k1 ^= tail[ 3] << 24;
- case 3: k1 ^= tail[ 2] << 16;
- case 2: k1 ^= tail[ 1] << 8;
+ case 4: k1 ^= tail[ 3] << 24; /*FALLTHROUGH*/
+ case 3: k1 ^= tail[ 2] << 16; /*FALLTHROUGH*/
+ case 2: k1 ^= tail[ 1] << 8; /*FALLTHROUGH*/
case 1: k1 ^= tail[ 0] << 0;
k1 *= c1; k1 = hash_rotl_32(k1, 15); k1 *= c2; h1 ^= k1;
}
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:06:50 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: assert.h
ctl.h log.h ql.h qr.h rb.h rtree.h
Log Message:
add constcond
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/assert.h \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/ctl.h \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/log.h \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/ql.h \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/qr.h \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/rb.h \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/rtree.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/assert.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/assert.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/assert.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/assert.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/assert.h Mon Mar 4 15:06:50 2019
@@ -13,7 +13,7 @@
__FILE__, __LINE__, #e);\
abort(); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#endif
#ifndef not_reached
@@ -25,7 +25,7 @@
abort(); \
}\
unreachable(); \
-} while (0)
+} while (/*CONSTCOND*/0)
#endif
#ifndef not_implemented
@@ -35,7 +35,7 @@
__FILE__, __LINE__);\
abort(); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#endif
#ifndef assert_not_implemented
@@ -43,7 +43,7 @@
if (unlikely(config_debug && !(e))) {\
not_implemented(); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#endif
/* Use to assert a particular configuration, e.g., cassert(config_debug). */
@@ -52,5 +52,5 @@
if (unlikely(!(c))) { \
not_reached(); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#endif
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/ctl.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/ctl.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/ctl.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/ctl.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/ctl.h Mon Mar 4 15:06:50 2019
@@ -109,7 +109,7 @@ void ctl_postfork_child(tsdn_t *tsdn);
name); \
abort(); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define xmallctlnametomib(name, mibp, miblenp) do { \
if (je_mallctlnametomib(name, mibp, miblenp) != 0) { \
@@ -117,7 +117,7 @@ void ctl_postfork_child(tsdn_t *tsdn);
"xmallctlnametomib(\"%s\", ...)\n", name); \
abort(); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define xmallctlbymib(mib, miblen, oldp, oldlenp, newp, newlen) do { \
if (je_mallctlbymib(mib, miblen, oldp, oldlenp, newp, \
@@ -126,6 +126,6 @@ void ctl_postfork_child(tsdn_t *tsdn);
": Failure in xmallctlbymib()\n"); \
abort(); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#endif /* JEMALLOC_INTERNAL_CTL_H */
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/log.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/log.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/log.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/log.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/log.h Mon Mar 4 15:06:50 2019
@@ -110,6 +110,6 @@ do { \
log_do_begin(log_var) \
log_impl_varargs((log_var).name, __VA_ARGS__); \
log_do_end(log_var) \
-} while (0)
+} while (/*CONSTCOND*/0)
#endif /* JEMALLOC_INTERNAL_LOG_H */
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/ql.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/ql.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/ql.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/ql.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/ql.h Mon Mar 4 15:06:50 2019
@@ -16,7 +16,7 @@ struct {\
/* List functions. */
#define ql_new(a_head) do { \
(a_head)->qlh_first = NULL; \
-} while (0)
+} while (/*CONSTCOND*/0)
#define ql_elm_new(a_elm, a_field) qr_new((a_elm), a_field)
@@ -39,7 +39,7 @@ struct {\
if (ql_first(a_head) == (a_qlelm)) {\
ql_first(a_head) = (a_elm);\
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define ql_after_insert(a_qlelm, a_elm, a_field) \
qr_after_insert((a_qlelm), (a_elm), a_field)
@@ -49,14 +49,14 @@ struct {\
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:06:31 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: ph.h
Log Message:
- fix shadowing
- add constcond
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h Mon Mar 4 15:06:31 2019
@@ -34,19 +34,19 @@ struct {\
(a_phn->a_field.phn_lchild)
#define phn_lchild_set(a_type, a_field, a_phn, a_lchild) do { \
a_phn->a_field.phn_lchild = a_lchild;\
-} while (0)
+} while (/*CONSTCOND*/0)
#define phn_next_get(a_type, a_field, a_phn)\
(a_phn->a_field.phn_next)
#define phn_prev_set(a_type, a_field, a_phn, a_prev) do { \
a_phn->a_field.phn_prev = a_prev;\
-} while (0)
+} while (/*CONSTCOND*/0)
#define phn_prev_get(a_type, a_field, a_phn)\
(a_phn->a_field.phn_prev)
#define phn_next_set(a_type, a_field, a_phn, a_next) do { \
a_phn->a_field.phn_next = a_next;\
-} while (0)
+} while (/*CONSTCOND*/0)
#define phn_merge_ordered(a_type, a_field, a_phn0, a_phn1, a_cmp) do { \
a_type *phn0child; \
@@ -62,7 +62,7 @@ struct {\
phn_prev_set(a_type, a_field, phn0child, a_phn1); \
}\
phn_lchild_set(a_type, a_field, a_phn0, a_phn1); \
-} while (0)
+} while (/*CONSTCOND*/0)
#define phn_merge(a_type, a_field, a_phn0, a_phn1, a_cmp, r_phn) do { \
if (a_phn0 == NULL) { \
@@ -78,7 +78,7 @@ struct {\
a_cmp); \
r_phn = a_phn1; \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define ph_merge_siblings(a_type, a_field, a_phn, a_cmp, r_phn) do { \
a_type *head = NULL; \
@@ -165,20 +165,20 @@ struct {\
} \
}\
r_phn = phn0; \
-} while (0)
+} while (/*CONSTCOND*/0)
#define ph_merge_aux(a_type, a_field, a_ph, a_cmp) do { \
- a_type *phn = phn_next_get(a_type, a_field, a_ph->ph_root); \
- if (phn != NULL) { \
+ a_type *_phn = phn_next_get(a_type, a_field, a_ph->ph_root); \
+ if (_phn != NULL) { \
phn_prev_set(a_type, a_field, a_ph->ph_root, NULL); \
phn_next_set(a_type, a_field, a_ph->ph_root, NULL); \
- phn_prev_set(a_type, a_field, phn, NULL); \
- ph_merge_siblings(a_type, a_field, phn, a_cmp, phn); \
- assert(phn_next_get(a_type, a_field, phn) == NULL); \
- phn_merge(a_type, a_field, a_ph->ph_root, phn, a_cmp, \
+ phn_prev_set(a_type, a_field, _phn, NULL); \
+ ph_merge_siblings(a_type, a_field, _phn, a_cmp, _phn); \
+ assert(phn_next_get(a_type, a_field, _phn) == NULL); \
+ phn_merge(a_type, a_field, a_ph->ph_root, _phn, a_cmp, \
a_ph->ph_root); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define ph_merge_children(a_type, a_field, a_phn, a_cmp, r_phn) do { \
a_type *lchild = phn_lchild_get(a_type, a_field, a_phn); \
@@ -188,7 +188,7 @@ struct {\
ph_merge_siblings(a_type, a_field, lchild, a_cmp, \
r_phn); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
/*
* The ph_proto() macro generates function prototypes that correspond to the
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:06:11 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: mutex_prof.h
Log Message:
Adjust to new names
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h:1.2 src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h:1.3
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h:1.2 Mon Mar 4 12:23:37 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h Mon Mar 4 15:06:11 2019
@@ -96,17 +96,16 @@ typedef struct {
uint64_t n_lock_ops;
} mutex_prof_data_t;
-#define MUTEX_PROF_DATA_ZERO_INITIALIZER \
+#define MUTEX_PROF_DATA_INITIALIZER \
{ \
- .tot_wait_time = NSTIME_ZERO_INITIALIZER, \
- .max_wait_time = NSTIME_ZERO_INITIALIZER, \
+ .tot_wait_time = NSTIME_INITIALIZER, \
+ .max_wait_time = NSTIME_INITIALIZER, \
.n_wait_times = 0, \
.n_spin_acquired = 0, \
.max_n_thds = 0, \
- .n_waiting_thds = 0, \
+ .n_waiting_thds = ATOMIC_INIT(0), \
.n_owner_switches = 0, \
.prev_owner = NULL, \
.n_lock_ops = 0, \
}
-
#endif /* JEMALLOC_INTERNAL_MUTEX_PROF_H */
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src Committed By: christos Date: Mon Mar 4 20:05:19 UTC 2019 Modified Files: src/external/bsd/jemalloc/dist/include/jemalloc/internal: malloc_io.h Log Message: adjust prototype To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/jemalloc/dist/include/jemalloc/internal/malloc_io.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/malloc_io.h diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/malloc_io.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/malloc_io.h:1.2 --- src/external/bsd/jemalloc/dist/include/jemalloc/internal/malloc_io.h:1.1.1.1 Mon Mar 4 12:10:23 2019 +++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/malloc_io.h Mon Mar 4 15:05:19 2019 @@ -41,7 +41,7 @@ #define MALLOC_PRINTF_BUFSIZE 4096 int buferror(int err, char *buf, size_t buflen); -uintmax_t malloc_strtoumax(const char *restrict nptr, char **restrict endptr, +uintmax_t malloc_strtoumax(const char *restrict nptr, const char **restrict endptr, int base); void malloc_write(const char *s);
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:05:01 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal:
jemalloc_internal_inlines_a.h
Log Message:
use UNCONST
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/jemalloc_internal_inlines_a.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/jemalloc_internal_inlines_a.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/jemalloc_internal_inlines_a.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/jemalloc_internal_inlines_a.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/jemalloc_internal_inlines_a.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/jemalloc_internal_inlines_a.h Mon Mar 4 15:05:01 2019
@@ -89,7 +89,7 @@ arena_get(tsdn_t *tsdn, unsigned ind, bo
if (unlikely(ret == NULL)) {
if (init_if_missing) {
ret = arena_init(tsdn, ind,
- (extent_hooks_t *)_hooks_default);
+ (extent_hooks_t *)__UNCONST(_hooks_default));
}
}
return ret;
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src Committed By: christos Date: Mon Mar 4 20:04:43 UTC 2019 Modified Files: src/external/bsd/jemalloc/dist/include/jemalloc/internal: hooks.h Log Message: fix prototypes To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/jemalloc/dist/include/jemalloc/internal/hooks.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/hooks.h diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/hooks.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/hooks.h:1.2 --- src/external/bsd/jemalloc/dist/include/jemalloc/internal/hooks.h:1.1.1.1 Mon Mar 4 12:10:23 2019 +++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/hooks.h Mon Mar 4 15:04:43 2019 @@ -1,8 +1,8 @@ #ifndef JEMALLOC_INTERNAL_HOOKS_H #define JEMALLOC_INTERNAL_HOOKS_H -extern JEMALLOC_EXPORT void (*hooks_arena_new_hook)(); -extern JEMALLOC_EXPORT void (*hooks_libc_hook)(); +extern JEMALLOC_EXPORT void (*hooks_arena_new_hook)(void); +extern JEMALLOC_EXPORT void (*hooks_libc_hook)(void); #define JEMALLOC_HOOK(fn, hook) ((void)(hook != NULL && (hook(), 0)), fn)
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src Committed By: christos Date: Mon Mar 4 20:04:30 UTC 2019 Modified Files: src/external/bsd/jemalloc/dist/include/jemalloc/internal: extent_externs.h Log Message: fix incorrect macro use To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_externs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_externs.h diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_externs.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_externs.h:1.2 --- src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_externs.h:1.1.1.1 Mon Mar 4 12:10:23 2019 +++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_externs.h Mon Mar 4 15:04:30 2019 @@ -24,7 +24,7 @@ size_t extent_size_quantize_floor(size_t size_t extent_size_quantize_ceil(size_t size); #endif -rb_proto(, extent_avail_, extent_tree_t, extent_t) +ph_proto(, extent_avail_, extent_tree_t, extent_t) ph_proto(, extent_heap_, extent_heap_t, extent_t) bool extents_init(tsdn_t *tsdn, extents_t *extents, extent_state_t state,
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:04:09 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: hash.h
Log Message:
fix const hash
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h Mon Mar 4 15:04:09 2019
@@ -27,7 +27,7 @@ hash_get_block_32(const uint32_t *p, int
if (unlikely((uintptr_t)p & (sizeof(uint32_t)-1)) != 0) {
uint32_t ret;
- memcpy(, (uint8_t *)(p + i), sizeof(uint32_t));
+ memcpy(, (const uint8_t *)(p + i), sizeof(uint32_t));
return ret;
}
@@ -40,7 +40,7 @@ hash_get_block_64(const uint64_t *p, int
if (unlikely((uintptr_t)p & (sizeof(uint64_t)-1)) != 0) {
uint64_t ret;
- memcpy(, (uint8_t *)(p + i), sizeof(uint64_t));
+ memcpy(, (const uint8_t *)(p + i), sizeof(uint64_t));
return ret;
}
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:03:53 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: bit_util.h
Log Message:
remove unused line
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/bit_util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/bit_util.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/bit_util.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/bit_util.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/bit_util.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/bit_util.h Mon Mar 4 15:03:53 2019
@@ -58,7 +58,6 @@ ffs_u32(uint32_t bitmap) {
#else
#error No implementation for 32-bit ffs()
#endif
- return ffs_u(bitmap);
}
BIT_UTIL_INLINE uint64_t
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:03:00 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal:
prof_inlines_b.h
Log Message:
fix shadowing
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/prof_inlines_b.h Mon Mar 4 15:03:00 2019
@@ -99,14 +99,14 @@ prof_sample_accum_update(tsd_t *tsd, siz
}
JEMALLOC_ALWAYS_INLINE prof_tctx_t *
-prof_alloc_prep(tsd_t *tsd, size_t usize, bool prof_active, bool update) {
+prof_alloc_prep(tsd_t *tsd, size_t usize, bool _prof_active, bool update) {
prof_tctx_t *ret;
prof_tdata_t *tdata;
prof_bt_t bt;
assert(usize == sz_s2u(usize));
- if (!prof_active || likely(prof_sample_accum_update(tsd, usize, update,
+ if (!_prof_active || likely(prof_sample_accum_update(tsd, usize, update,
))) {
ret = (prof_tctx_t *)(uintptr_t)1U;
} else {
@@ -135,14 +135,14 @@ prof_malloc(tsdn_t *tsdn, const void *pt
JEMALLOC_ALWAYS_INLINE void
prof_realloc(tsd_t *tsd, const void *ptr, size_t usize, prof_tctx_t *tctx,
-bool prof_active, bool updated, const void *old_ptr, size_t old_usize,
+bool _prof_active, bool updated, const void *old_ptr, size_t old_usize,
prof_tctx_t *old_tctx) {
bool sampled, old_sampled, moved;
cassert(config_prof);
assert(ptr != NULL || (uintptr_t)tctx <= (uintptr_t)1U);
- if (prof_active && !updated && ptr != NULL) {
+ if (_prof_active && !updated && ptr != NULL) {
assert(usize == isalloc(tsd_tsdn(tsd), ptr));
if (prof_sample_accum_update(tsd, usize, true, NULL)) {
/*
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:02:18 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: spin.h
Log Message:
fix prototype
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/spin.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/spin.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/spin.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/spin.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/spin.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/spin.h Mon Mar 4 15:02:18 2019
@@ -8,7 +8,7 @@ typedef struct {
} spin_t;
static inline void
-spin_cpu_spinwait() {
+spin_cpu_spinwait(void) {
# if HAVE_CPU_SPINWAIT
CPU_SPINWAIT;
# else
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:01:59 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: witness.h
Log Message:
use c99 initializers
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/witness.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/witness.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/witness.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/witness.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/witness.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/witness.h Mon Mar 4 15:01:59 2019
@@ -65,7 +65,13 @@
/* PER-WITNESS DATA */
/**/
#if defined(JEMALLOC_DEBUG)
-# define WITNESS_INITIALIZER(name, rank) {name, rank, NULL, NULL, {NULL, NULL}}
+# define WITNESS_INITIALIZER(_name, _rank) { \
+ .name = _name, \
+ .rank = _rank, \
+ .comp = NULL, \
+ .opaque = NULL, \
+ .link = { .qre_prev = NULL, .qre_next = NULL }, \
+}
#else
# define WITNESS_INITIALIZER(name, rank)
#endif
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 20:01:42 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: emitter.h
Log Message:
use __format_arg__ to check format arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/emitter.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/emitter.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/emitter.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/emitter.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/emitter.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/emitter.h Mon Mar 4 15:01:42 2019
@@ -115,10 +115,11 @@ emitter_table_printf(emitter_t *emitter,
}
}
-static inline void
+static inline const char * __attribute__((__format_arg__(3)))
emitter_gen_fmt(char *out_fmt, size_t out_size, const char *fmt_specifier,
emitter_justify_t justify, int width) {
size_t written;
+ fmt_specifier++;
if (justify == emitter_justify_none) {
written = malloc_snprintf(out_fmt, out_size,
"%%%s", fmt_specifier);
@@ -131,6 +132,7 @@ emitter_gen_fmt(char *out_fmt, size_t ou
}
/* Only happens in case of bad format string, which *we* choose. */
assert(written < out_size);
+ return out_fmt;
}
/*
@@ -156,26 +158,27 @@ emitter_print_value(emitter_t *emitter,
char buf[BUF_SIZE];
#define EMIT_SIMPLE(type, format) \
- emitter_gen_fmt(fmt, FMT_SIZE, format, justify, width); \
- emitter_printf(emitter, fmt, *(const type *)value); \
+ emitter_printf(emitter, \
+ emitter_gen_fmt(fmt, FMT_SIZE, format, justify, width), \
+ *(const type *)value);
switch (value_type) {
case emitter_type_bool:
- emitter_gen_fmt(fmt, FMT_SIZE, "s", justify, width);
- emitter_printf(emitter, fmt, *(const bool *)value ?
- "true" : "false");
+ emitter_printf(emitter,
+ emitter_gen_fmt(fmt, FMT_SIZE, "%s", justify, width),
+ *(const bool *)value ? "true" : "false");
break;
case emitter_type_int:
- EMIT_SIMPLE(int, "d")
+ EMIT_SIMPLE(int, "%d")
break;
case emitter_type_unsigned:
- EMIT_SIMPLE(unsigned, "u")
+ EMIT_SIMPLE(unsigned, "%u")
break;
case emitter_type_ssize:
- EMIT_SIMPLE(ssize_t, "zd")
+ EMIT_SIMPLE(ssize_t, "%zd")
break;
case emitter_type_size:
- EMIT_SIMPLE(size_t, "zu")
+ EMIT_SIMPLE(size_t, "%zu")
break;
case emitter_type_string:
str_written = malloc_snprintf(buf, BUF_SIZE, "\"%s\"",
@@ -185,17 +188,17 @@ emitter_print_value(emitter_t *emitter,
* anywhere near the fmt size.
*/
assert(str_written < BUF_SIZE);
- emitter_gen_fmt(fmt, FMT_SIZE, "s", justify, width);
- emitter_printf(emitter, fmt, buf);
+ emitter_printf(emitter,
+ emitter_gen_fmt(fmt, FMT_SIZE, "%s", justify, width), buf);
break;
case emitter_type_uint32:
- EMIT_SIMPLE(uint32_t, FMTu32)
+ EMIT_SIMPLE(uint32_t, "%" FMTu32)
break;
case emitter_type_uint64:
- EMIT_SIMPLE(uint64_t, FMTu64)
+ EMIT_SIMPLE(uint64_t, "%" FMTu64)
break;
case emitter_type_title:
- EMIT_SIMPLE(char *const, "s");
+ EMIT_SIMPLE(char *const, "%s");
break;
default:
unreachable();
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src Committed By: christos Date: Mon Mar 4 19:41:37 UTC 2019 Modified Files: src/external/bsd/jemalloc/lib: Makefile Log Message: bump warns To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/jemalloc/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/jemalloc/lib/Makefile diff -u src/external/bsd/jemalloc/lib/Makefile:1.1 src/external/bsd/jemalloc/lib/Makefile:1.2 --- src/external/bsd/jemalloc/lib/Makefile:1.1 Mon Mar 4 12:29:49 2019 +++ src/external/bsd/jemalloc/lib/Makefile Mon Mar 4 14:41:37 2019 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2019/03/04 17:29:49 christos Exp $ +# $NetBSD: Makefile,v 1.2 2019/03/04 19:41:37 christos Exp $ +WARNS?= 5 .include LIB=jemalloc
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src
Committed By: christos
Date: Mon Mar 4 19:41:51 UTC 2019
Modified Files:
src/external/bsd/jemalloc/lib: Makefile.inc
Log Message:
no need to elide format-non-literal
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/jemalloc/lib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/lib/Makefile.inc
diff -u src/external/bsd/jemalloc/lib/Makefile.inc:1.1 src/external/bsd/jemalloc/lib/Makefile.inc:1.2
--- src/external/bsd/jemalloc/lib/Makefile.inc:1.1 Mon Mar 4 12:29:24 2019
+++ src/external/bsd/jemalloc/lib/Makefile.inc Mon Mar 4 14:41:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2019/03/04 17:29:24 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2019/03/04 19:41:51 christos Exp $
JEMALLOC:=${.PARSEDIR}/../
@@ -42,7 +42,7 @@ COPTS.${i}+= -fvisibility=hidden -funrol
COPTS.background_thread.c+=-Wno-error=stack-protector
COPTS.ctl.c+=-Wno-error=stack-protector
-COPTS.stats.c+=-Wno-error=stack-protector -Wno-error=format-nonliteral
+COPTS.stats.c+=-Wno-error=stack-protector
COPTS.tcache.c+=-Wno-error=stack-protector
SRCS+=${JEMALLOC_SRCS}
CVS commit: src/external/bsd/jemalloc/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 19:40:57 UTC 2019
Modified Files:
src/external/bsd/jemalloc/include/jemalloc/internal: emitter.h
Log Message:
use __format_arg__ to check arguments...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/jemalloc/include/jemalloc/internal/emitter.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/include/jemalloc/internal/emitter.h
diff -u src/external/bsd/jemalloc/include/jemalloc/internal/emitter.h:1.1 src/external/bsd/jemalloc/include/jemalloc/internal/emitter.h:1.2
--- src/external/bsd/jemalloc/include/jemalloc/internal/emitter.h:1.1 Mon Mar 4 12:25:09 2019
+++ src/external/bsd/jemalloc/include/jemalloc/internal/emitter.h Mon Mar 4 14:40:57 2019
@@ -115,10 +115,11 @@ emitter_table_printf(emitter_t *emitter,
}
}
-static inline void
+static inline const char * __attribute__((__format_arg__(3)))
emitter_gen_fmt(char *out_fmt, size_t out_size, const char *fmt_specifier,
emitter_justify_t justify, int width) {
size_t written;
+ fmt_specifier++;
if (justify == emitter_justify_none) {
written = malloc_snprintf(out_fmt, out_size,
"%%%s", fmt_specifier);
@@ -131,6 +132,7 @@ emitter_gen_fmt(char *out_fmt, size_t ou
}
/* Only happens in case of bad format string, which *we* choose. */
assert(written < out_size);
+ return out_fmt;
}
/*
@@ -156,26 +158,27 @@ emitter_print_value(emitter_t *emitter,
char buf[BUF_SIZE];
#define EMIT_SIMPLE(type, format) \
- emitter_gen_fmt(fmt, FMT_SIZE, format, justify, width); \
- emitter_printf(emitter, fmt, *(const type *)value); \
+ emitter_printf(emitter, \
+ emitter_gen_fmt(fmt, FMT_SIZE, format, justify, width), \
+ *(const type *)value);
switch (value_type) {
case emitter_type_bool:
- emitter_gen_fmt(fmt, FMT_SIZE, "s", justify, width);
- emitter_printf(emitter, fmt, *(const bool *)value ?
- "true" : "false");
+ emitter_printf(emitter,
+ emitter_gen_fmt(fmt, FMT_SIZE, "%s", justify, width),
+ *(const bool *)value ? "true" : "false");
break;
case emitter_type_int:
- EMIT_SIMPLE(int, "d")
+ EMIT_SIMPLE(int, "%d")
break;
case emitter_type_unsigned:
- EMIT_SIMPLE(unsigned, "u")
+ EMIT_SIMPLE(unsigned, "%u")
break;
case emitter_type_ssize:
- EMIT_SIMPLE(ssize_t, "zd")
+ EMIT_SIMPLE(ssize_t, "%zd")
break;
case emitter_type_size:
- EMIT_SIMPLE(size_t, "zu")
+ EMIT_SIMPLE(size_t, "%zu")
break;
case emitter_type_string:
str_written = malloc_snprintf(buf, BUF_SIZE, "\"%s\"",
@@ -185,17 +188,17 @@ emitter_print_value(emitter_t *emitter,
* anywhere near the fmt size.
*/
assert(str_written < BUF_SIZE);
- emitter_gen_fmt(fmt, FMT_SIZE, "s", justify, width);
- emitter_printf(emitter, fmt, buf);
+ emitter_printf(emitter,
+ emitter_gen_fmt(fmt, FMT_SIZE, "%s", justify, width), buf);
break;
case emitter_type_uint32:
- EMIT_SIMPLE(uint32_t, FMTu32)
+ EMIT_SIMPLE(uint32_t, "%" FMTu32)
break;
case emitter_type_uint64:
- EMIT_SIMPLE(uint64_t, FMTu64)
+ EMIT_SIMPLE(uint64_t, "%" FMTu64)
break;
case emitter_type_title:
- EMIT_SIMPLE(char *const, "s");
+ EMIT_SIMPLE(char *const, "%s");
break;
default:
unreachable();
CVS commit: src/lib/libc
Module Name:src Committed By: christos Date: Mon Mar 4 19:20:12 UTC 2019 Modified Files: src/lib/libc: shlib_version Log Message: bump for jemalloc To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/lib/libc/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/shlib_version diff -u src/lib/libc/shlib_version:1.282 src/lib/libc/shlib_version:1.283 --- src/lib/libc/shlib_version:1.282 Sun Nov 4 23:08:39 2018 +++ src/lib/libc/shlib_version Mon Mar 4 14:20:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.282 2018/11/05 04:08:39 maya Exp $ +# $NetBSD: shlib_version,v 1.283 2019/03/04 19:20:12 christos Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # # things we wish to do on next major version bump: @@ -54,4 +54,4 @@ # - move statfs() to libcompat since we have statvfs() # - the syscall stubs for the (obsolete) lfs syscalls should be removed major=12 -minor=211 +minor=212
CVS commit: src/external/bsd/jemalloc/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 19:16:31 UTC 2019
Modified Files:
src/external/bsd/jemalloc/include/jemalloc/internal: mutex.h
Log Message:
Put back braces.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/jemalloc/include/jemalloc/internal/mutex.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/include/jemalloc/internal/mutex.h
diff -u src/external/bsd/jemalloc/include/jemalloc/internal/mutex.h:1.1 src/external/bsd/jemalloc/include/jemalloc/internal/mutex.h:1.2
--- src/external/bsd/jemalloc/include/jemalloc/internal/mutex.h:1.1 Mon Mar 4 12:25:09 2019
+++ src/external/bsd/jemalloc/include/jemalloc/internal/mutex.h Mon Mar 4 14:16:31 2019
@@ -110,10 +110,10 @@ struct malloc_mutex_s {
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
#else
#define MALLOC_MUTEX_TYPE PTHREAD_MUTEX_DEFAULT
-#define MALLOC_MUTEX_INITIALIZER {{ \
+#define MALLOC_MUTEX_INITIALIZER {{{ \
.prof_data = MUTEX_PROF_DATA_INITIALIZER, \
.lock = PTHREAD_MUTEX_INITIALIZER, \
- }, \
+ }}, \
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
#endif
CVS commit: src/external/bsd/jemalloc/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 19:16:10 UTC 2019
Modified Files:
src/external/bsd/jemalloc/include/jemalloc/internal: mutex_prof.h
Log Message:
use ATOMIC_INIT()
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/jemalloc/include/jemalloc/internal/mutex_prof.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/include/jemalloc/internal/mutex_prof.h
diff -u src/external/bsd/jemalloc/include/jemalloc/internal/mutex_prof.h:1.1 src/external/bsd/jemalloc/include/jemalloc/internal/mutex_prof.h:1.2
--- src/external/bsd/jemalloc/include/jemalloc/internal/mutex_prof.h:1.1 Mon Mar 4 12:25:09 2019
+++ src/external/bsd/jemalloc/include/jemalloc/internal/mutex_prof.h Mon Mar 4 14:16:10 2019
@@ -103,7 +103,7 @@ typedef struct {
.n_wait_times = 0, \
.n_spin_acquired = 0, \
.max_n_thds = 0, \
- .n_waiting_thds = 0, \
+ .n_waiting_thds = ATOMIC_INIT(0), \
.n_owner_switches = 0, \
.prev_owner = NULL, \
.n_lock_ops = 0, \
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 19:15:39 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: base.c
Log Message:
put back __UNCONST for now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/jemalloc/dist/src/base.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/base.c
diff -u src/external/bsd/jemalloc/dist/src/base.c:1.2 src/external/bsd/jemalloc/dist/src/base.c:1.3
--- src/external/bsd/jemalloc/dist/src/base.c:1.2 Mon Mar 4 12:19:45 2019
+++ src/external/bsd/jemalloc/dist/src/base.c Mon Mar 4 14:15:39 2019
@@ -509,6 +509,7 @@ base_postfork_child(tsdn_t *tsdn, base_t
bool
base_boot(tsdn_t *tsdn) {
- b0 = base_new(tsdn, 0, (extent_hooks_t *)__UNCONST(_hooks_default));
+ b0 = base_new(tsdn, 0, (extent_hooks_t *)
+ __UNCONST(_hooks_default));
return (b0 == NULL);
}
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:45:16 UTC 2019
Modified Files:
src/usr.bin/xlint/lint1: cgram.y decl.c lint1.h scan.l
Log Message:
Add __thread/tls_model attribute
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.69 -r1.70 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.88 -r1.89 src/usr.bin/xlint/lint1/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.103 src/usr.bin/xlint/lint1/cgram.y:1.104
--- src/usr.bin/xlint/lint1/cgram.y:1.103 Mon Mar 4 10:28:18 2019
+++ src/usr.bin/xlint/lint1/cgram.y Mon Mar 4 12:45:16 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.103 2019/03/04 15:28:18 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.104 2019/03/04 17:45:16 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.103 2019/03/04 15:28:18 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.104 2019/03/04 17:45:16 christos Exp $");
#endif
#include
@@ -235,6 +235,7 @@ anonymize(sym_t *s)
%token T_AT_SECTION
%token T_AT_SENTINEL
%token T_AT_STRING
+%token T_AT_TLS_MODEL
%token T_AT_TUNION
%token T_AT_UNUSED
%token T_AT_USED
@@ -547,6 +548,7 @@ type_attribute_spec:
| T_AT_ALIAS T_LPARN string T_RPARN
| T_AT_PCS T_LPARN string T_RPARN
| T_AT_SECTION T_LPARN string T_RPARN
+ | T_AT_TLS_MODEL T_LPARN string T_RPARN
| T_AT_ALIGNED
| T_AT_CONSTRUCTOR
| T_AT_DESTRUCTOR
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.69 src/usr.bin/xlint/lint1/decl.c:1.70
--- src/usr.bin/xlint/lint1/decl.c:1.69 Fri Sep 7 11:16:15 2018
+++ src/usr.bin/xlint/lint1/decl.c Mon Mar 4 12:45:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.69 2018/09/07 15:16:15 christos Exp $ */
+/* $NetBSD: decl.c,v 1.70 2019/03/04 17:45:16 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.69 2018/09/07 15:16:15 christos Exp $");
+__RCSID("$NetBSD: decl.c,v 1.70 2019/03/04 17:45:16 christos Exp $");
#endif
#include
@@ -568,6 +568,8 @@ addqual(tqual_t q)
}
dcs->d_const = 1;
} else {
+ if (q == THREAD)
+ return;
if (q != VOLATILE)
LERROR("addqual()");
if (dcs->d_volatile) {
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.30 src/usr.bin/xlint/lint1/lint1.h:1.31
--- src/usr.bin/xlint/lint1/lint1.h:1.30 Tue Dec 27 16:52:35 2016
+++ src/usr.bin/xlint/lint1/lint1.h Mon Mar 4 12:45:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.30 2016/12/27 21:52:35 christos Exp $ */
+/* $NetBSD: lint1.h,v 1.31 2019/03/04 17:45:16 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -95,7 +95,7 @@ typedef struct strg {
* qualifiers (only for lex/yacc interface)
*/
typedef enum {
- CONST, VOLATILE, RESTRICT
+ CONST, VOLATILE, RESTRICT, THREAD
} tqual_t;
/*
Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.88 src/usr.bin/xlint/lint1/scan.l:1.89
--- src/usr.bin/xlint/lint1/scan.l:1.88 Mon Mar 4 10:26:18 2019
+++ src/usr.bin/xlint/lint1/scan.l Mon Mar 4 12:45:16 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.88 2019/03/04 15:26:18 christos Exp $ */
+/* $NetBSD: scan.l,v 1.89 2019/03/04 17:45:16 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.88 2019/03/04 15:26:18 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.89 2019/03/04 17:45:16 christos Exp $");
#endif
#include
@@ -209,6 +209,7 @@ static struct kwtab {
{ "__int128_t", T_TYPE, 0, INT128, 0, 0,1,0,0,1 },
{ "__uint128_t",T_TYPE, 0, UINT128,0, 0,1,0,0,1 },
#endif
+ { "__thread", T_QUAL, 0, 0, THREAD, 0,0,1,0,7 },
{ "_Bool", T_TYPE, 0, BOOL, 0, 0,1,0,0,1 },
{ "_Complex", T_TYPE, 0, COMPLEX,0, 0,1,0,0,1 },
{ "_Generic", T_GENERIC, 0, 0, 0, 0,1,0,0,1 },
@@ -284,9 +285,10 @@ static struct kwtab {
{ "string", T_AT_STRING, 0, 0, 0, 0,0,1,1,5 },
{ "struct", T_SOU, 0, STRUCT, 0, 0,0,0,0,1 },
{ "switch", T_SWITCH, 0, 0, 0, 0,0,0,0,1 },
- { "symbolrename", T_SYMBOLRENAME, 0, 0, 0, 0,0,0,0,2 },
+ { "symbolrename", T_SYMBOLRENAME,0, 0, 0, 0,0,0,0,2 },
{ "syslog", T_AT_FORMAT_SYSLOG,0, 0, 0, 0,0,1,1,5 },
{ "transparent_union",T_AT_TUNION,0, 0, 0, 0,0,1,1,5 },
+ { "tls_model", T_AT_TLS_MODEL, 0, 0, 0, 0,0,1,1,5 },
{ "typedef", T_SCLASS, TYPEDEF, 0, 0, 0,0,0,0,1 },
{ "typeof", T_TYPEOF, 0, 0, 0,
CVS commit: src/doc
Module Name:src Committed By: christos Date: Mon Mar 4 17:36:35 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new jemalloc To generate a diff of this commit: cvs rdiff -u -r1.1599 -r1.1600 src/doc/3RDPARTY cvs rdiff -u -r1.2506 -r1.2507 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1599 src/doc/3RDPARTY:1.1600 --- src/doc/3RDPARTY:1.1599 Sun Feb 24 15:04:01 2019 +++ src/doc/3RDPARTY Mon Mar 4 12:36:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1599 2019/02/24 20:04:01 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1600 2019/03/04 17:36:35 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -599,6 +599,19 @@ ipsec-tools has stable branches (e.g.: i are manually pulled up to NetBSD stable branches (e.g.: netbsd-4 is regularly sync with ipsec-tools-0_7-branch) +Package: jemalloc +Version: 5.1.0 +Current Vers: 5.1.0 +Maintainer: Christos Zoulas +Archive Site: https://github.com/jemalloc/jemalloc +Home Page: https://jemalloc.net +Date: 2019-03-04 +Mailing List: +Responsible: christos +License: BSD +Location: external/bsd/jemalloc +Notes: + Package: KAME IPv6 Version: KAME/NetBSD SNAP kit Current Vers: KAME/NetBSD SNAP kit (shipped every week) Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2506 src/doc/CHANGES:1.2507 --- src/doc/CHANGES:1.2506 Sun Mar 3 09:05:41 2019 +++ src/doc/CHANGES Mon Mar 4 12:36:35 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2506 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2507 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -342,3 +342,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: and BCM57787 [msaitoh 20190220] bind: Import version 9.13.7. [christos 20190224] arm: Add support for Amlogic S905 SoC. [jmcneill 20190225] + jemalloc: Import 5.1.0 [christos 20190304]
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:32:46 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch amd64 to jemalloc-5.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.1105 -r1.1106 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1105 src/share/mk/bsd.own.mk:1.1106
--- src/share/mk/bsd.own.mk:1.1105 Sun Mar 3 20:14:31 2019
+++ src/share/mk/bsd.own.mk Mon Mar 4 12:32:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1105 2019/03/04 01:14:31 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1106 2019/03/04 17:32:46 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -168,6 +168,16 @@ EXTERNAL_BINUTILS_SUBDIR= binutils.old
EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
.endif
+#
+# What version of jemalloc we use (100 is the one
+# built-in to libc from 2005 (pre version 3).
+#
+.if ${MACHINE_CPU} == "x86_64"
+HAVE_JEMALLOC?= 510
+.else
+HAVE_JEMALLOC?= 100
+.endif
+
.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:30:33 UTC 2019
Modified Files:
src/lib/libc/stdlib: Makefile.inc
Log Message:
Hook for jemalloc
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/lib/libc/stdlib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/Makefile.inc
diff -u src/lib/libc/stdlib/Makefile.inc:1.94 src/lib/libc/stdlib/Makefile.inc:1.95
--- src/lib/libc/stdlib/Makefile.inc:1.94 Fri Jan 5 15:51:13 2018
+++ src/lib/libc/stdlib/Makefile.inc Mon Mar 4 12:30:33 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.94 2018/01/05 20:51:13 snj Exp $
+# $NetBSD: Makefile.inc,v 1.95 2019/03/04 17:30:33 christos Exp $
# from: @(#)Makefile.inc 8.3 (Berkeley) 2/4/95
# stdlib sources
.PATH: ${ARCHDIR}/stdlib ${.CURDIR}/stdlib
SRCS+= _env.c _rand48.c \
- a64l.c abort.c aligned_alloc.c atexit.c atof.c atoi.c atol.c atoll.c \
+ a64l.c abort.c atexit.c atof.c atoi.c atol.c atoll.c \
bsearch.c cxa_thread_atexit.c drand48.c exit.c \
getenv.c getopt.c getopt_long.c getsubopt.c \
hcreate.c heapsort.c imaxdiv.c insque.c jrand48.c l64a.c lldiv.c \
@@ -26,11 +26,15 @@ SRCS+= div.c ldiv.c imaxdiv.c
SRCS+= erand48_ieee754.c
.if ${RUMPRUN} != "yes"
-.if (${USE_JEMALLOC} != "no")
-SRCS+= jemalloc.c
-.else
+. if (${USE_JEMALLOC} != "no")
+. if ${HAVE_JEMALLOC} > 100
+. include "${NETBSDSRCDIR}/external/bsd/jemalloc/lib/Makefile.inc"
+. else
+SRCS+= jemalloc.c aligned_alloc.c
+. endif
+. else
SRCS+= malloc.c
-.endif
+. endif
.endif
CPPFLAGS.strtol.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:26:52 UTC 2019
Added Files:
src/external/bsd/jemalloc/lib: divide.c
Log Message:
We already have div.{c,S} in libc so we call this one divide.c
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/jemalloc/lib/divide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/jemalloc/lib/divide.c
diff -u /dev/null src/external/bsd/jemalloc/lib/divide.c:1.1
--- /dev/null Mon Mar 4 12:26:52 2019
+++ src/external/bsd/jemalloc/lib/divide.c Mon Mar 4 12:26:51 2019
@@ -0,0 +1 @@
+#include "../dist/src/div.c"
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:29:24 UTC 2019
Added Files:
src/external/bsd/jemalloc/lib: Makefile.inc
Log Message:
Add glue for libc.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/jemalloc/lib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/jemalloc/lib/Makefile.inc
diff -u /dev/null src/external/bsd/jemalloc/lib/Makefile.inc:1.1
--- /dev/null Mon Mar 4 12:29:24 2019
+++ src/external/bsd/jemalloc/lib/Makefile.inc Mon Mar 4 12:29:24 2019
@@ -0,0 +1,51 @@
+# $NetBSD: Makefile.inc,v 1.1 2019/03/04 17:29:24 christos Exp $
+
+JEMALLOC:=${.PARSEDIR}/../
+
+JEMALLOC_SRCS+= \
+jemalloc.c \
+arena.c \
+background_thread.c \
+base.c \
+bin.c \
+bitmap.c \
+ckh.c \
+ctl.c \
+divide.c \
+extent.c \
+extent_dss.c \
+extent_mmap.c \
+hash.c \
+hooks.c \
+large.c \
+log.c \
+malloc_io.c \
+mutex.c \
+mutex_pool.c \
+nstime.c \
+pages.c \
+prng.c \
+prof.c \
+rtree.c \
+stats.c \
+sz.c \
+tcache.c \
+ticker.c \
+tsd.c \
+witness.c
+
+.PATH: ${JEMALLOC}/dist/src ${JEMALLOC}/lib
+.for i in ${JEMALLOC_SRCS}
+CPPFLAGS.${i}+=-I${JEMALLOC}/include -DJEMALLOC_NO_PRIVATE_NAMESPACE
+COPTS.${i}+= -fvisibility=hidden -funroll-loops
+.endfor
+
+COPTS.background_thread.c+=-Wno-error=stack-protector
+COPTS.ctl.c+=-Wno-error=stack-protector
+COPTS.stats.c+=-Wno-error=stack-protector -Wno-error=format-nonliteral
+COPTS.tcache.c+=-Wno-error=stack-protector
+
+SRCS+=${JEMALLOC_SRCS}
+
+jemalloc.d jemalloc.pico jemalloc.o jemalloc.ln jemalloc.po jemalloc.go: \
+${JEMALLOC}/dist/src/jemalloc.c
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src Committed By: christos Date: Mon Mar 4 17:29:49 UTC 2019 Added Files: src/external/bsd/jemalloc/lib: Makefile shlib_version Log Message: Add Makefiles if we want to build jemalloc standalone. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/jemalloc/lib/Makefile \ src/external/bsd/jemalloc/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/jemalloc/lib/Makefile diff -u /dev/null src/external/bsd/jemalloc/lib/Makefile:1.1 --- /dev/null Mon Mar 4 12:29:49 2019 +++ src/external/bsd/jemalloc/lib/Makefile Mon Mar 4 12:29:49 2019 @@ -0,0 +1,9 @@ +# $NetBSD: Makefile,v 1.1 2019/03/04 17:29:49 christos Exp $ + +.include + +LIB=jemalloc + +.include "Makefile.inc" + +.include Index: src/external/bsd/jemalloc/lib/shlib_version diff -u /dev/null src/external/bsd/jemalloc/lib/shlib_version:1.1 --- /dev/null Mon Mar 4 12:29:49 2019 +++ src/external/bsd/jemalloc/lib/shlib_version Mon Mar 4 12:29:49 2019 @@ -0,0 +1,3 @@ +# $NetBSD: shlib_version,v 1.1 2019/03/04 17:29:49 christos Exp $ +major=0 +minor=0
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:24:03 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: mutex.h
Log Message:
use c99 initializers
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h Mon Mar 4 12:24:02 2019
@@ -94,28 +94,27 @@ struct malloc_mutex_s {
#define MALLOC_MUTEX_TRYLOCK(m) (pthread_mutex_trylock(&(m)->lock) != 0)
#endif
-#define LOCK_PROF_DATA_INITIALIZER \
-{NSTIME_ZERO_INITIALIZER, NSTIME_ZERO_INITIALIZER, 0, 0, 0, \
- ATOMIC_INIT(0), 0, NULL, 0}
-
#ifdef _WIN32
# define MALLOC_MUTEX_INITIALIZER
#elif (defined(JEMALLOC_OS_UNFAIR_LOCK))
# define MALLOC_MUTEX_INITIALIZER \
- {{{LOCK_PROF_DATA_INITIALIZER, OS_UNFAIR_LOCK_INIT}}, \
+ {{{MUTEX_PROF_DATA_INITIALIZER, OS_UNFAIR_LOCK_INIT}}, \
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
#elif (defined(JEMALLOC_OSSPIN))
# define MALLOC_MUTEX_INITIALIZER \
- {{{LOCK_PROF_DATA_INITIALIZER, 0}},\
+ {{{MUTEX_PROF_DATA_INITIALIZER, 0}},\
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
#elif (defined(JEMALLOC_MUTEX_INIT_CB))
# define MALLOC_MUTEX_INITIALIZER \
- {{{LOCK_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, NULL}}, \
+ {{{MUTEX_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, NULL}}, \
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
#else
#define MALLOC_MUTEX_TYPE PTHREAD_MUTEX_DEFAULT
#define MALLOC_MUTEX_INITIALIZER \
- {{{LOCK_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER}}, \
+ {{{
+ .prof_data = MUTEX_PROF_DATA_INITIALIZER,
+ .lock = PTHREAD_MUTEX_INITIALIZER,
+ }}, \
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
#endif
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:23:37 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: mutex_prof.h
Log Message:
Add a c99 initializer
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex_prof.h Mon Mar 4 12:23:37 2019
@@ -96,4 +96,17 @@ typedef struct {
uint64_t n_lock_ops;
} mutex_prof_data_t;
+#define MUTEX_PROF_DATA_ZERO_INITIALIZER \
+ { \
+ .tot_wait_time = NSTIME_ZERO_INITIALIZER, \
+ .max_wait_time = NSTIME_ZERO_INITIALIZER, \
+ .n_wait_times = 0, \
+ .n_spin_acquired = 0, \
+ .max_n_thds = 0, \
+ .n_waiting_thds = 0, \
+ .n_owner_switches = 0, \
+ .prev_owner = NULL, \
+ .n_lock_ops = 0, \
+ }
+
#endif /* JEMALLOC_INTERNAL_MUTEX_PROF_H */
CVS commit: src/external/bsd/jemalloc/dist/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:23:10 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/include/jemalloc/internal: nstime.h
Log Message:
use c99 initializers
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/nstime.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/nstime.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/nstime.h:1.1.1.1 src/external/bsd/jemalloc/dist/include/jemalloc/internal/nstime.h:1.2
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/nstime.h:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/nstime.h Mon Mar 4 12:23:10 2019
@@ -3,12 +3,13 @@
/* Maximum supported number of seconds (~584 years). */
#define NSTIME_SEC_MAX KQU(18446744072)
-#define NSTIME_ZERO_INITIALIZER {0}
+#define NSTIME_INITIALIZER { .ns = 0 }
typedef struct {
uint64_t ns;
} nstime_t;
+
void nstime_init(nstime_t *time, uint64_t ns);
void nstime_init2(nstime_t *time, uint64_t sec, uint64_t nsec);
uint64_t nstime_ns(const nstime_t *time);
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:21:31 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: ckh.c ctl.c
Log Message:
- add unconst
- fixes for shadowing
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/ckh.c \
src/external/bsd/jemalloc/dist/src/ctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/ckh.c
diff -u src/external/bsd/jemalloc/dist/src/ckh.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/ckh.c:1.2
--- src/external/bsd/jemalloc/dist/src/ckh.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/ckh.c Mon Mar 4 12:21:31 2019
@@ -356,14 +356,14 @@ ckh_shrink(tsd_t *tsd, ckh_t *ckh) {
}
bool
-ckh_new(tsd_t *tsd, ckh_t *ckh, size_t minitems, ckh_hash_t *hash,
+ckh_new(tsd_t *tsd, ckh_t *ckh, size_t minitems, ckh_hash_t *hashp,
ckh_keycomp_t *keycomp) {
bool ret;
size_t mincells, usize;
unsigned lg_mincells;
assert(minitems > 0);
- assert(hash != NULL);
+ assert(hashp != NULL);
assert(keycomp != NULL);
#ifdef CKH_COUNT
@@ -392,7 +392,7 @@ ckh_new(tsd_t *tsd, ckh_t *ckh, size_t m
}
ckh->lg_minbuckets = lg_mincells - LG_CKH_BUCKET_CELLS;
ckh->lg_curbuckets = lg_mincells - LG_CKH_BUCKET_CELLS;
- ckh->hash = hash;
+ ckh->hash = hashp;
ckh->keycomp = keycomp;
usize = sz_sa2u(sizeof(ckhc_t) << lg_mincells, CACHELINE);
@@ -449,10 +449,10 @@ ckh_iter(ckh_t *ckh, size_t *tabind, voi
LG_CKH_BUCKET_CELLS)); i < ncells; i++) {
if (ckh->tab[i].key != NULL) {
if (key != NULL) {
-*key = (void *)ckh->tab[i].key;
+*key = (void *)__UNCONST(ckh->tab[i].key);
}
if (data != NULL) {
-*data = (void *)ckh->tab[i].data;
+*data = (void *)__UNCONST(ckh->tab[i].data);
}
*tabind = i + 1;
return false;
@@ -495,10 +495,10 @@ ckh_remove(tsd_t *tsd, ckh_t *ckh, const
cell = ckh_isearch(ckh, searchkey);
if (cell != SIZE_T_MAX) {
if (key != NULL) {
- *key = (void *)ckh->tab[cell].key;
+ *key = (void *)__UNCONST(ckh->tab[cell].key);
}
if (data != NULL) {
- *data = (void *)ckh->tab[cell].data;
+ *data = (void *)__UNCONST(ckh->tab[cell].data);
}
ckh->tab[cell].key = NULL;
ckh->tab[cell].data = NULL; /* Not necessary. */
@@ -527,10 +527,10 @@ ckh_search(ckh_t *ckh, const void *searc
cell = ckh_isearch(ckh, searchkey);
if (cell != SIZE_T_MAX) {
if (key != NULL) {
- *key = (void *)ckh->tab[cell].key;
+ *key = (void *)__UNCONST(ckh->tab[cell].key);
}
if (data != NULL) {
- *data = (void *)ckh->tab[cell].data;
+ *data = (void *)__UNCONST(ckh->tab[cell].data);
}
return false;
}
@@ -548,7 +548,7 @@ ckh_string_keycomp(const void *k1, const
assert(k1 != NULL);
assert(k2 != NULL);
- return !strcmp((char *)k1, (char *)k2);
+ return !strcmp((const char *)k1, (const char *)k2);
}
void
Index: src/external/bsd/jemalloc/dist/src/ctl.c
diff -u src/external/bsd/jemalloc/dist/src/ctl.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/ctl.c:1.2
--- src/external/bsd/jemalloc/dist/src/ctl.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/ctl.c Mon Mar 4 12:21:31 2019
@@ -234,7 +234,7 @@ CTL_PROTO(stats_mutexes_reset)
#define NAME(n) {true}, n
#define CHILD(t, c) \
sizeof(c##_node) / sizeof(ctl_##t##_node_t), \
- (ctl_node_t *)c##_node, \
+ (const ctl_node_t *)c##_node, \
NULL
#define CTL(c) 0, NULL, c##_ctl
@@ -1299,14 +1299,14 @@ ctl_postfork_child(tsdn_t *tsdn) {
ret = EPERM; \
goto label_return; \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define WRITEONLY() do { \
if (oldp != NULL || oldlenp != NULL) {\
ret = EPERM; \
goto label_return; \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define READ_XOR_WRITE() do { \
if ((oldp != NULL && oldlenp != NULL) && (newp != NULL || \
@@ -1314,7 +1314,7 @@ ctl_postfork_child(tsdn_t *tsdn) {
ret = EPERM; \
goto label_return; \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define READ(v, t) do { \
if (oldp != NULL && oldlenp != NULL) {\
@@ -1327,7 +1327,7 @@ ctl_postfork_child(tsdn_t *tsdn) {
} \
*(t *)oldp = (v); \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define WRITE(v, t) do { \
if (newp != NULL) { \
@@ -1337,7 +1337,7 @@ ctl_postfork_child(tsdn_t *tsdn) {
} \
(v) = *(t *)newp; \
}\
-} while (0)
+} while (/*CONSTCOND*/0)
#define MIB_UNSIGNED(v, i) do { \
if (mib[i] > UINT_MAX) { \
@@ -1345,7 +1345,7 @@ ctl_postfork_child(tsdn_t *tsdn) {
goto label_return; \
}\
v = (unsigned)mib[i]; \
-} while (0)
+} while (/*CONSTCOND*/0)
/*
* There's a lot of code duplication in the following macros due to limitations
@@ -2262,7 +2262,7 @@ arena_i_extent_hooks_ctl(tsd_t
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:20:07 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: extent.c
Log Message:
fix for shadowing.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/extent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/extent.c
diff -u src/external/bsd/jemalloc/dist/src/extent.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/extent.c:1.2
--- src/external/bsd/jemalloc/dist/src/extent.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/extent.c Mon Mar 4 12:20:07 2019
@@ -1113,14 +1113,14 @@ extent_recycle(tsdn_t *tsdn, arena_t *ar
if (*zero) {
void *addr = extent_base_get(extent);
- size_t size = extent_size_get(extent);
+ size_t sz = extent_size_get(extent);
if (!extent_zeroed_get(extent)) {
- if (pages_purge_forced(addr, size)) {
-memset(addr, 0, size);
+ if (pages_purge_forced(addr, sz)) {
+memset(addr, 0, sz);
}
} else if (config_debug) {
size_t *p = (size_t *)(uintptr_t)addr;
- for (size_t i = 0; i < size / sizeof(size_t); i++) {
+ for (size_t i = 0; i < sz / sizeof(size_t); i++) {
assert(p[i] == 0);
}
}
@@ -1365,18 +1365,18 @@ extent_grow_retained(tsdn_t *tsdn, arena
extent_addr_randomize(tsdn, extent, alignment);
}
if (slab) {
- rtree_ctx_t rtree_ctx_fallback;
- rtree_ctx_t *rtree_ctx = tsdn_rtree_ctx(tsdn,
- _ctx_fallback);
+ rtree_ctx_t rtree_ctx_fallback1;
+ rtree_ctx_t *rtree_ctx1 = tsdn_rtree_ctx(tsdn,
+ _ctx_fallback1);
extent_slab_set(extent, true);
- extent_interior_register(tsdn, rtree_ctx, extent, szind);
+ extent_interior_register(tsdn, rtree_ctx1, extent, szind);
}
if (*zero && !extent_zeroed_get(extent)) {
void *addr = extent_base_get(extent);
- size_t size = extent_size_get(extent);
- if (pages_purge_forced(addr, size)) {
- memset(addr, 0, size);
+ size_t sz = extent_size_get(extent);
+ if (pages_purge_forced(addr, sz)) {
+ memset(addr, 0, sz);
}
}
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:19:45 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: base.c
Log Message:
add __UNCONST
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/base.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/base.c
diff -u src/external/bsd/jemalloc/dist/src/base.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/base.c:1.2
--- src/external/bsd/jemalloc/dist/src/base.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/base.c Mon Mar 4 12:19:45 2019
@@ -509,6 +509,6 @@ base_postfork_child(tsdn_t *tsdn, base_t
bool
base_boot(tsdn_t *tsdn) {
- b0 = base_new(tsdn, 0, (extent_hooks_t *)_hooks_default);
+ b0 = base_new(tsdn, 0, (extent_hooks_t *)__UNCONST(_hooks_default));
return (b0 == NULL);
}
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:18:53 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: prof.c
Log Message:
- add UNCONST
- fix for shadowing
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/prof.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/prof.c
diff -u src/external/bsd/jemalloc/dist/src/prof.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/prof.c:1.2
--- src/external/bsd/jemalloc/dist/src/prof.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/prof.c Mon Mar 4 12:18:53 2019
@@ -1267,7 +1267,7 @@ struct prof_tdata_merge_iter_arg_s {
};
static prof_tdata_t *
-prof_tdata_merge_iter(prof_tdata_tree_t *tdatas, prof_tdata_t *tdata,
+prof_tdata_merge_iter(prof_tdata_tree_t *tdatasunused, prof_tdata_t *tdata,
void *opaque) {
struct prof_tdata_merge_iter_arg_s *arg =
(struct prof_tdata_merge_iter_arg_s *)opaque;
@@ -1302,7 +1302,7 @@ prof_tdata_merge_iter(prof_tdata_tree_t
}
static prof_tdata_t *
-prof_tdata_dump_iter(prof_tdata_tree_t *tdatas, prof_tdata_t *tdata,
+prof_tdata_dump_iter(prof_tdata_tree_t *tdatasunused, prof_tdata_t *tdata,
void *arg) {
bool propagate_err = *(bool *)arg;
@@ -1867,7 +1867,7 @@ prof_gdump(tsdn_t *tsdn) {
static void
prof_bt_hash(const void *key, size_t r_hash[2]) {
- prof_bt_t *bt = (prof_bt_t *)key;
+ const prof_bt_t *bt = (const prof_bt_t *)key;
cassert(config_prof);
@@ -1876,8 +1876,8 @@ prof_bt_hash(const void *key, size_t r_h
static bool
prof_bt_keycomp(const void *k1, const void *k2) {
- const prof_bt_t *bt1 = (prof_bt_t *)k1;
- const prof_bt_t *bt2 = (prof_bt_t *)k2;
+ const prof_bt_t *bt1 = (const prof_bt_t *)k1;
+ const prof_bt_t *bt2 = (const prof_bt_t *)k2;
cassert(config_prof);
@@ -2050,7 +2050,7 @@ prof_tdata_expire(tsdn_t *tsdn, prof_tda
}
static prof_tdata_t *
-prof_tdata_reset_iter(prof_tdata_tree_t *tdatas, prof_tdata_t *tdata,
+prof_tdata_reset_iter(prof_tdata_tree_t *tdatasunused, prof_tdata_t *tdata,
void *arg) {
tsdn_t *tsdn = (tsdn_t *)arg;
@@ -2141,7 +2141,7 @@ prof_thread_name_alloc(tsdn_t *tsdn, con
size = strlen(thread_name) + 1;
if (size == 1) {
- return "";
+ return __UNCONST(""); // XXX
}
ret = iallocztm(tsdn, size, sz_size2index(size), false, NULL, true,
@@ -2170,7 +2170,7 @@ prof_thread_name_set(tsd_t *tsd, const c
}
for (i = 0; thread_name[i] != '\0'; i++) {
char c = thread_name[i];
- if (!isgraph(c) && !isblank(c)) {
+ if (!isgraph((unsigned char)c) && !isblank((unsigned char)c)) {
return EFAULT;
}
}
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src Committed By: christos Date: Mon Mar 4 17:19:14 UTC 2019 Modified Files: src/external/bsd/jemalloc/dist/src: hooks.c Log Message: fix prototypes To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/hooks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/jemalloc/dist/src/hooks.c diff -u src/external/bsd/jemalloc/dist/src/hooks.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/hooks.c:1.2 --- src/external/bsd/jemalloc/dist/src/hooks.c:1.1.1.1 Mon Mar 4 12:10:23 2019 +++ src/external/bsd/jemalloc/dist/src/hooks.c Mon Mar 4 12:19:14 2019 @@ -6,7 +6,7 @@ * from outside the generated library, so that we can use them in test code. */ JEMALLOC_EXPORT -void (*hooks_arena_new_hook)() = NULL; +void (*hooks_arena_new_hook)(void) = NULL; JEMALLOC_EXPORT -void (*hooks_libc_hook)() = NULL; +void (*hooks_libc_hook)(void) = NULL;
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:18:27 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: jemalloc.c
Log Message:
- fix for shadowing
- add unconst
- add hack for broken lint
- add cast for ctype macros
- disable realloc(ptr, 0) returning NULL for non-NULL ptr (compatibility)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/jemalloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/jemalloc.c
diff -u src/external/bsd/jemalloc/dist/src/jemalloc.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/jemalloc.c:1.2
--- src/external/bsd/jemalloc/dist/src/jemalloc.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/jemalloc.c Mon Mar 4 12:18:27 2019
@@ -157,7 +157,12 @@ static const void (WINAPI *init_init_loc
#endif
#endif
#else
+#ifndef __lint__
+// Broken lint
static malloc_mutex_t init_lock = MALLOC_MUTEX_INITIALIZER;
+#else
+static malloc_mutex_t init_lock;
+#endif
#endif
typedef struct {
@@ -562,8 +567,8 @@ arena_choose_hard(tsd_t *tsd, bool inter
/* Initialize a new arena. */
choose[j] = first_null;
arena = arena_init_locked(tsd_tsdn(tsd),
-choose[j],
-(extent_hooks_t *)_hooks_default);
+choose[j], (extent_hooks_t *)
+__UNCONST(_hooks_default));
if (arena == NULL) {
malloc_mutex_unlock(tsd_tsdn(tsd),
_lock);
@@ -974,7 +979,7 @@ malloc_conf_init(void) {
#define CONF_HANDLE_T_U(t, o, n, min, max, check_min, check_max, clip) \
if (CONF_MATCH(n)) {\
uintmax_t um;\
-char *end;\
+const char *end; \
\
set_errno(0);\
um = malloc_strtoumax(v, , 0); \
@@ -1051,12 +1056,12 @@ malloc_conf_init(void) {
CONF_HANDLE_BOOL(opt_abort, "abort")
CONF_HANDLE_BOOL(opt_abort_conf, "abort_conf")
if (strncmp("metadata_thp", k, klen) == 0) {
-int i;
+int ii;
bool match = false;
-for (i = 0; i < metadata_thp_mode_limit; i++) {
- if (strncmp(metadata_thp_mode_names[i],
+for (ii = 0; ii < metadata_thp_mode_limit; ii++) {
+ if (strncmp(metadata_thp_mode_names[ii],
v, vlen) == 0) {
- opt_metadata_thp = i;
+ opt_metadata_thp = ii;
match = true;
break;
}
@@ -1069,18 +1074,18 @@ malloc_conf_init(void) {
}
CONF_HANDLE_BOOL(opt_retain, "retain")
if (strncmp("dss", k, klen) == 0) {
-int i;
+int ii;
bool match = false;
-for (i = 0; i < dss_prec_limit; i++) {
- if (strncmp(dss_prec_names[i], v, vlen)
+for (ii = 0; ii < dss_prec_limit; ii++) {
+ if (strncmp(dss_prec_names[ii], v, vlen)
== 0) {
- if (extent_dss_prec_set(i)) {
+ if (extent_dss_prec_set(ii)) {
malloc_conf_error(
"Error setting dss",
k, klen, v, vlen);
} else {
opt_dss =
- dss_prec_names[i];
+ dss_prec_names[ii];
match = true;
break;
}
@@ -1143,21 +1148,21 @@ malloc_conf_init(void) {
CONF_HANDLE_BOOL(opt_tcache, "tcache")
CONF_HANDLE_SIZE_T(opt_lg_extent_max_active_fit,
"lg_extent_max_active_fit", 0,
- (sizeof(size_t) << 3), yes, yes, false)
+ (sizeof(size_t) << 3), no, yes, false)
CONF_HANDLE_SSIZE_T(opt_lg_tcache_max, "lg_tcache_max",
-1, (sizeof(size_t) << 3) - 1)
if (strncmp("percpu_arena", k, klen) == 0) {
bool match = false;
-for (int i = percpu_arena_mode_names_base; i <
-percpu_arena_mode_names_limit; i++) {
- if (strncmp(percpu_arena_mode_names[i],
+for (int ii = percpu_arena_mode_names_base; ii <
+percpu_arena_mode_names_limit; ii++) {
+ if (strncmp(percpu_arena_mode_names[ii],
v, vlen) == 0) {
if (!have_percpu_arena) {
malloc_conf_error(
"No getcpu support",
k, klen, v, vlen);
}
- opt_percpu_arena = i;
+ opt_percpu_arena = ii;
match = true;
break;
}
@@ -1204,15 +1209,15 @@ malloc_conf_init(void) {
}
if (CONF_MATCH("thp")) {
bool match = false;
-for (int i = 0; i < thp_mode_names_limit; i++) {
- if (strncmp(thp_mode_names[i],v, vlen)
+for (int ii = 0; ii < thp_mode_names_limit; ii++) {
+ if (strncmp(thp_mode_names[ii],v, vlen)
== 0) {
if (!have_madvise_huge) {
malloc_conf_error(
"No THP support",
k, klen, v, vlen);
}
- opt_thp = i;
+ opt_thp = ii;
match = true;
break;
}
@@ -1272,7 +1277,7 @@ malloc_init_hard_needed(void) {
}
static bool
-malloc_init_hard_a0_locked() {
+malloc_init_hard_a0_locked(void) {
malloc_initializer = INITIALIZER;
if (config_prof) {
@@ -1321,7 +1326,7 @@ malloc_init_hard_a0_locked() {
* Initialize one arena here. The rest are lazily created in
*
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:16:47 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: mutex.c
Log Message:
rename initializer for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/mutex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/mutex.c
diff -u src/external/bsd/jemalloc/dist/src/mutex.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/mutex.c:1.2
--- src/external/bsd/jemalloc/dist/src/mutex.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/mutex.c Mon Mar 4 12:16:46 2019
@@ -46,7 +46,7 @@ JEMALLOC_EXPORT int _pthread_mutex_init_
void
malloc_mutex_lock_slow(malloc_mutex_t *mutex) {
mutex_prof_data_t *data = >prof_data;
- UNUSED nstime_t before = NSTIME_ZERO_INITIALIZER;
+ UNUSED nstime_t before = NSTIME_INITIALIZER;
if (ncpus == 1) {
goto label_spin_done;
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:16:27 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: malloc_io.c
Log Message:
remove needless casts after fixing prototype.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/malloc_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/malloc_io.c
diff -u src/external/bsd/jemalloc/dist/src/malloc_io.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/malloc_io.c:1.2
--- src/external/bsd/jemalloc/dist/src/malloc_io.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/malloc_io.c Mon Mar 4 12:16:27 2019
@@ -111,7 +111,7 @@ buferror(int err, char *buf, size_t bufl
}
uintmax_t
-malloc_strtoumax(const char *restrict nptr, char **restrict endptr, int base) {
+malloc_strtoumax(const char *restrict nptr, const char **restrict endptr, int base) {
uintmax_t ret, digit;
unsigned b;
bool neg;
@@ -223,9 +223,9 @@ label_return:
if (endptr != NULL) {
if (p == ns) {
/* No characters were converted. */
- *endptr = (char *)nptr;
+ *endptr = nptr;
} else {
- *endptr = (char *)p;
+ *endptr = p;
}
}
return ret;
@@ -460,7 +460,7 @@ malloc_vsnprintf(char *str, size_t size,
case '5': case '6': case '7': case '8': case '9': {
uintmax_t uwidth;
set_errno(0);
-uwidth = malloc_strtoumax(f, (char **), 10);
+uwidth = malloc_strtoumax(f, , 10);
assert(uwidth != UINTMAX_MAX || get_errno() !=
ERANGE);
width = (int)uwidth;
@@ -484,7 +484,7 @@ malloc_vsnprintf(char *str, size_t size,
case '5': case '6': case '7': case '8': case '9': {
uintmax_t uprec;
set_errno(0);
-uprec = malloc_strtoumax(f, (char **), 10);
+uprec = malloc_strtoumax(f, , 10);
assert(uprec != UINTMAX_MAX || get_errno() !=
ERANGE);
prec = (int)uprec;
CVS commit: src/external/bsd/jemalloc/dist/src
Module Name:src
Committed By: christos
Date: Mon Mar 4 17:15:37 UTC 2019
Modified Files:
src/external/bsd/jemalloc/dist/src: stats.c
Log Message:
rename for shadowing
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/jemalloc/dist/src/stats.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/dist/src/stats.c
diff -u src/external/bsd/jemalloc/dist/src/stats.c:1.1.1.1 src/external/bsd/jemalloc/dist/src/stats.c:1.2
--- src/external/bsd/jemalloc/dist/src/stats.c:1.1.1.1 Mon Mar 4 12:10:23 2019
+++ src/external/bsd/jemalloc/dist/src/stats.c Mon Mar 4 12:15:37 2019
@@ -1008,10 +1008,10 @@ stats_general_print(emitter_t *emitter)
emitter_kv(emitter, "nbins", "Number of bin size classes",
emitter_type_unsigned, );
- unsigned nhbins;
- CTL_GET("arenas.nhbins", , unsigned);
+ unsigned nh_bins;
+ CTL_GET("arenas.nhbins", _bins, unsigned);
emitter_kv(emitter, "nhbins", "Number of thread-cache bin size classes",
- emitter_type_unsigned, );
+ emitter_type_unsigned, _bins);
/*
* We do enough mallctls in a loop that we actually want to omit them
CVS import: src/external/bsd/jemalloc/dist
Module Name:src Committed By: christos Date: Mon Mar 4 17:10:23 UTC 2019 Update of /cvsroot/src/external/bsd/jemalloc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26584 Log Message: import jemalloc-5.1.0 Status: Vendor Tag: JASONE Release Tags: jemalloc-5-1-0 N src/external/bsd/jemalloc/dist/.appveyor.yml N src/external/bsd/jemalloc/dist/.autom4te.cfg N src/external/bsd/jemalloc/dist/.gitattributes N src/external/bsd/jemalloc/dist/.gitignore N src/external/bsd/jemalloc/dist/.travis.yml N src/external/bsd/jemalloc/dist/COPYING N src/external/bsd/jemalloc/dist/ChangeLog N src/external/bsd/jemalloc/dist/INSTALL.md N src/external/bsd/jemalloc/dist/Makefile.in N src/external/bsd/jemalloc/dist/README N src/external/bsd/jemalloc/dist/TUNING.md N src/external/bsd/jemalloc/dist/autogen.sh N src/external/bsd/jemalloc/dist/config.stamp.in N src/external/bsd/jemalloc/dist/configure.ac N src/external/bsd/jemalloc/dist/jemalloc.pc.in N src/external/bsd/jemalloc/dist/run_tests.sh N src/external/bsd/jemalloc/dist/configure N src/external/bsd/jemalloc/dist/VERSION N src/external/bsd/jemalloc/dist/bin/jemalloc-config.in N src/external/bsd/jemalloc/dist/bin/jemalloc.sh.in N src/external/bsd/jemalloc/dist/bin/jeprof.in N src/external/bsd/jemalloc/dist/build-aux/config.guess N src/external/bsd/jemalloc/dist/build-aux/config.sub N src/external/bsd/jemalloc/dist/build-aux/install-sh N src/external/bsd/jemalloc/dist/doc/jemalloc.xml.in N src/external/bsd/jemalloc/dist/doc/html.xsl.in N src/external/bsd/jemalloc/dist/doc/manpages.xsl.in N src/external/bsd/jemalloc/dist/doc/stylesheet.xsl N src/external/bsd/jemalloc/dist/doc/jemalloc.html N src/external/bsd/jemalloc/dist/doc/jemalloc.3 N src/external/bsd/jemalloc/dist/include/jemalloc/jemalloc_defs.h.in N src/external/bsd/jemalloc/dist/include/jemalloc/jemalloc.sh N src/external/bsd/jemalloc/dist/include/jemalloc/jemalloc_typedefs.h.in N src/external/bsd/jemalloc/dist/include/jemalloc/jemalloc_macros.h.in N src/external/bsd/jemalloc/dist/include/jemalloc/jemalloc_mangle.sh N src/external/bsd/jemalloc/dist/include/jemalloc/jemalloc_protos.h.in N src/external/bsd/jemalloc/dist/include/jemalloc/jemalloc_rename.sh N src/external/bsd/jemalloc/dist/include/jemalloc/internal/arena_inlines_a.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/arena_externs.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/background_thread_externs.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/arena_inlines_b.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/arena_stats.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/arena_structs_a.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/arena_structs_b.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/arena_types.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/assert.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/atomic.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/atomic_c11.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/atomic_gcc_atomic.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/atomic_gcc_sync.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/atomic_msvc.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/bin_stats.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/bin.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/background_thread_inlines.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/background_thread_structs.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/base_externs.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/base_inlines.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/base_structs.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/base_types.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_externs.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/bit_util.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/bitmap.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/cache_bin.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/ckh.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/ctl.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/div.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/emitter.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_dss.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_inlines.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_mmap.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_structs.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/extent_types.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/hash.h N src/external/bsd/jemalloc/dist/include/jemalloc/internal/hooks.h N
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Mon Mar 4 15:28:18 UTC 2019
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
add a two argument version of alloc_size
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.102 src/usr.bin/xlint/lint1/cgram.y:1.103
--- src/usr.bin/xlint/lint1/cgram.y:1.102 Mon Mar 4 10:26:18 2019
+++ src/usr.bin/xlint/lint1/cgram.y Mon Mar 4 10:28:18 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.102 2019/03/04 15:26:18 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.103 2019/03/04 15:28:18 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.102 2019/03/04 15:26:18 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.103 2019/03/04 15:28:18 christos Exp $");
#endif
#include
@@ -536,6 +536,7 @@ type_attribute_spec:
| T_AT_DEPRECATED T_LPARN string T_RPARN
| T_AT_DEPRECATED
| T_AT_ALIGNED T_LPARN constant T_RPARN
+ | T_AT_ALLOC_SIZE T_LPARN constant T_COMMA constant T_RPARN
| T_AT_ALLOC_SIZE T_LPARN constant T_RPARN
| T_AT_BOUNDED T_LPARN type_attribute_bounded_type
T_COMMA constant T_COMMA constant T_RPARN
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Mon Mar 4 15:26:18 UTC 2019
Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l
Log Message:
add gnu_printf
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/xlint/lint1/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.101 src/usr.bin/xlint/lint1/cgram.y:1.102
--- src/usr.bin/xlint/lint1/cgram.y:1.101 Sun Mar 3 18:06:08 2019
+++ src/usr.bin/xlint/lint1/cgram.y Mon Mar 4 10:26:18 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.101 2019/03/03 23:06:08 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.102 2019/03/04 15:26:18 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.101 2019/03/03 23:06:08 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.102 2019/03/04 15:26:18 christos Exp $");
#endif
#include
@@ -212,6 +212,7 @@ anonymize(sym_t *s)
%token T_AT_DESTRUCTOR
%token T_AT_FORMAT
%token T_AT_FORMAT_ARG
+%token T_AT_FORMAT_GNU_PRINTF
%token T_AT_FORMAT_PRINTF
%token T_AT_FORMAT_SCANF
%token T_AT_FORMAT_STRFMON
@@ -515,7 +516,8 @@ declaration:
;
type_attribute_format_type:
- T_AT_FORMAT_PRINTF
+ T_AT_FORMAT_GNU_PRINTF
+ | T_AT_FORMAT_PRINTF
| T_AT_FORMAT_SCANF
| T_AT_FORMAT_STRFMON
| T_AT_FORMAT_STRFTIME
Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.87 src/usr.bin/xlint/lint1/scan.l:1.88
--- src/usr.bin/xlint/lint1/scan.l:1.87 Sun Mar 3 18:06:08 2019
+++ src/usr.bin/xlint/lint1/scan.l Mon Mar 4 10:26:18 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.87 2019/03/03 23:06:08 christos Exp $ */
+/* $NetBSD: scan.l,v 1.88 2019/03/04 15:26:18 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.87 2019/03/03 23:06:08 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.88 2019/03/04 15:26:18 christos Exp $");
#endif
#include
@@ -245,6 +245,7 @@ static struct kwtab {
{ "format", T_AT_FORMAT, 0, 0, 0, 0,0,1,1,5 },
{ "format_arg", T_AT_FORMAT_ARG,0, 0, 0, 0,0,1,1,5 },
{ "gnu_inline", T_AT_GNU_INLINE,0, 0, 0, 0,0,1,1,5 },
+ { "gnu_printf", T_AT_FORMAT_GNU_PRINTF,0,0, 0, 0,0,1,1,5 },
{ "goto", T_GOTO, 0, 0, 0, 0,0,0,0,1 },
{ "if", T_IF, 0, 0, 0, 0,0,0,0,1 },
{ "imag", T_IMAG, 0, 0, 0, 0,1,0,0,4 },
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Mon Mar 4 14:31:26 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: Add XNA To generate a diff of this commit: cvs rdiff -u -r1.233 -r1.234 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.233 src/share/misc/acronyms.comp:1.234 --- src/share/misc/acronyms.comp:1.233 Mon Mar 4 13:37:53 2019 +++ src/share/misc/acronyms.comp Mon Mar 4 14:31:26 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.233 2019/03/04 13:37:53 sevan Exp $ +$NetBSD: acronyms.comp,v 1.234 2019/03/04 14:31:26 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1605,6 +1605,7 @@ XGA Extended Graphics Array XHR XMLHttpRequest XIP execute in place XML Extensible Markup Language +XNA XNA's not acronymed XNS Xerox network systems XOR exclusive or XP extreme programming
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Mon Mar 4 13:37:53 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: Add SNA, TIL, XNS, XTI To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.232 src/share/misc/acronyms.comp:1.233 --- src/share/misc/acronyms.comp:1.232 Thu Feb 21 01:20:45 2019 +++ src/share/misc/acronyms.comp Mon Mar 4 13:37:53 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.232 2019/02/21 01:20:45 sevan Exp $ +$NetBSD: acronyms.comp,v 1.233 2019/03/04 13:37:53 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1344,6 +1344,7 @@ SMP symmetric multiprocessing SMT simultaneous multithreading SMTP Simple Mail Transfer Protocol SMU system management unit +SNA systems network architecture SNAP Sub-Network Access Protocol SNIA Storage Networking Industry Association SNMP Simple Network Management Protocol @@ -1439,6 +1440,7 @@ TKIP Temporal Key Integrity Protocol TLA top level aggregator TLB translation lookaside buffer TLD top level domain +TLI transport layer interface TLS thread local storage TLS transport layer security TM Turing machine @@ -1603,12 +1605,14 @@ XGA Extended Graphics Array XHR XMLHttpRequest XIP execute in place XML Extensible Markup Language +XNS Xerox network systems XOR exclusive or XP extreme programming XSI X/Open System Interface XSL extensible stylesheet language XSS cross site scripting XT extended technology +XTI X/Open transport interface XUL XML user interface language YACC yet another compiler compiler YAML YAML ain't markup language
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jmcneill Date: Mon Mar 4 11:35:38 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_emac.c Log Message: Enable hw csum offload by default To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/sunxi/sunxi_emac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/sunxi/sunxi_emac.c diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.21 src/sys/arch/arm/sunxi/sunxi_emac.c:1.22 --- src/sys/arch/arm/sunxi/sunxi_emac.c:1.21 Tue Jan 22 03:42:25 2019 +++ src/sys/arch/arm/sunxi/sunxi_emac.c Mon Mar 4 11:35:38 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_emac.c,v 1.21 2019/01/22 03:42:25 msaitoh Exp $ */ +/* $NetBSD: sunxi_emac.c,v 1.22 2019/03/04 11:35:38 jmcneill Exp $ */ /*- * Copyright (c) 2016-2017 Jared McNeill @@ -33,7 +33,7 @@ #include "opt_net_mpsafe.h" #include -__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.21 2019/01/22 03:42:25 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.22 2019/03/04 11:35:38 jmcneill Exp $"); #include #include @@ -1440,6 +1440,7 @@ sunxi_emac_attach(device_t parent, devic IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Rx | IFCAP_CSUM_UDPv4_Tx; + ifp->if_capenable = ifp->if_capabilities; IFQ_SET_MAXLEN(>if_snd, IFQ_MAXLEN); IFQ_SET_READY(>if_snd);
CVS commit: src/external/mit/xorg/bin/xmore
Module Name:src
Committed By: mrg
Date: Mon Mar 4 09:25:05 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xmore: Makefile
Log Message:
add new man subdir to .PATH
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xmore/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xmore/Makefile
diff -u src/external/mit/xorg/bin/xmore/Makefile:1.4 src/external/mit/xorg/bin/xmore/Makefile:1.5
--- src/external/mit/xorg/bin/xmore/Makefile:1.4 Sat Aug 14 09:26:46 2010
+++ src/external/mit/xorg/bin/xmore/Makefile Mon Mar 4 09:25:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/08/14 09:26:46 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/03/04 09:25:04 mrg Exp $
.include
@@ -13,7 +13,7 @@ LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXp
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} \
${LIBICE} ${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults ${X11SRCDIR.${PROG}}/man
.include
.include
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Mar 4 08:36:42 UTC 2019
Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_bo.c
xsrc/external/mit/pixman/dist/pixman: pixman-bits-image.c
pixman-inlines.h pixman-private.h
xsrc/external/mit/pixman/include: config.h
Removed Files:
xsrc/external/mit/libdrm/dist: README
Log Message:
merge libdrm 2.4.97 and pixman 0.38.0.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libdrm/dist/README
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.22 -r1.23 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/pixman/dist/pixman/pixman-inlines.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/pixman/dist/pixman/pixman-private.h
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/pixman/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.11 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.12
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.11 Thu Jan 10 08:59:43 2019
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h Mon Mar 4 08:36:42 2019
@@ -101,6 +101,8 @@ typedef struct { volatile LIBDRM_ATOMIC_
#error libdrm requires atomic operations, please define them for your CPU/compiler.
#endif
+#undef HAS_ATOMIC_OPS
+
static inline int atomic_add_unless(atomic_t *v, int add, int unless)
{
int c, old;
Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.22 xsrc/external/mit/libdrm/dist/xf86drm.c:1.23
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.22 Thu Jan 10 08:59:43 2019
+++ xsrc/external/mit/libdrm/dist/xf86drm.c Mon Mar 4 08:36:42 2019
@@ -59,6 +59,8 @@
#endif
#include
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
/* Not all systems have MAP_FAILED defined */
#ifndef MAP_FAILED
#define MAP_FAILED ((void *)-1)
@@ -103,7 +105,7 @@
#define DRM_MAJOR 226 /* Linux */
#endif
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__DragonFly__)
struct drm_pciinfo {
uint16_t domain;
uint8_t bus;
@@ -2988,6 +2990,17 @@ static int drmParseSubsystemType(int maj
char path[PATH_MAX + 1];
char link[PATH_MAX + 1] = "";
char *name;
+struct {
+const char *name;
+int bus_type;
+} bus_types[] = {
+{ "/pci", DRM_BUS_PCI },
+{ "/usb", DRM_BUS_USB },
+{ "/platform", DRM_BUS_PLATFORM },
+{ "/spi", DRM_BUS_PLATFORM },
+{ "/host1x", DRM_BUS_HOST1X },
+{ "/virtio", DRM_BUS_VIRTIO },
+};
snprintf(path, PATH_MAX, "/sys/dev/char/%d:%d/device/subsystem",
maj, min);
@@ -2999,20 +3012,10 @@ static int drmParseSubsystemType(int maj
if (!name)
return -EINVAL;
-if (strncmp(name, "/pci", 4) == 0)
-return DRM_BUS_PCI;
-
-if (strncmp(name, "/usb", 4) == 0)
-return DRM_BUS_USB;
-
-if (strncmp(name, "/platform", 9) == 0)
-return DRM_BUS_PLATFORM;
-
-if (strncmp(name, "/host1x", 7) == 0)
-return DRM_BUS_HOST1X;
-
-if (strncmp(name, "/virtio", 7) == 0)
-return DRM_BUS_VIRTIO;
+for (unsigned i = 0; i < ARRAY_SIZE(bus_types); i++) {
+if (strncmp(name, bus_types[i].name, strlen(bus_types[i].name)) == 0)
+return bus_types[i].bus_type;
+}
return -EINVAL;
#elif defined(__NetBSD__)
@@ -3074,7 +3077,7 @@ static int drmParseSubsystemType(int maj
/* Success or not, we're done. */
return ret;
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__DragonFly__)
return DRM_BUS_PCI;
#else
#warning "Missing implementation of drmParseSubsystemType"
@@ -3190,7 +3193,7 @@ static int drmParsePciBusInfo(int maj, i
/* Success! */
return 0;
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__DragonFly__)
struct drm_pciinfo pinfo;
int fd, type;
@@ -3279,7 +3282,6 @@ static int parse_separate_sysfs_files(in
drmPciDeviceInfoPtr device,
bool ignore_revision)
{
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
static const char *attrs[] = {
"revision", /* Older kernels are missing the file, so check for it first */
"vendor",
@@ -3399,7 +3401,7 @@ out:
ret = -errno;
close(pcifd);
return ret;
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__DragonFly__)
struct drm_pciinfo pinfo;
int fd, type;
Index: xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
diff
CVS commit: xsrc/external/mit/xclock/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Mar 4 08:28:59 UTC 2019
Modified Files:
xsrc/external/mit/xclock/dist: Clock.c
Log Message:
- add likely missing () around || expression.
- use fabsl() not abs().
both picked up by clang and the new xclock.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/xclock/dist/Clock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xclock/dist/Clock.c
diff -u xsrc/external/mit/xclock/dist/Clock.c:1.1.1.6 xsrc/external/mit/xclock/dist/Clock.c:1.2
--- xsrc/external/mit/xclock/dist/Clock.c:1.1.1.6 Sun Mar 3 08:16:14 2019
+++ xsrc/external/mit/xclock/dist/Clock.c Mon Mar 4 08:28:59 2019
@@ -1610,8 +1610,8 @@ clock_tic(XtPointer client_data, XtInter
RenderHands (w, , False);
}
if (w->clock.show_second_hand &&
-tm.tm_sec != w->clock.otm.tm_sec ||
-tv.tv_usec != w->clock.otv.tv_usec)
+(tm.tm_sec != w->clock.otm.tm_sec ||
+ tv.tv_usec != w->clock.otv.tv_usec))
{
RenderSec (w, >clock.otm, >clock.otv, False);
RenderSec (w, , , False);
@@ -2173,10 +2173,10 @@ SetValues(Widget gcurrent, Widget greque
if (new->clock.update && XtIsRealized( (Widget) new))
new->clock.interval_id = XtAppAddTimeOut(
XtWidgetToApplicationContext(gnew),
- abs(new->clock.update)*1000,
+ fabsl(new->clock.update)*1000,
clock_tic, (XtPointer)gnew);
- new->clock.show_second_hand =(abs(new->clock.update) <= SECOND_HAND_TIME);
+ new->clock.show_second_hand =(fabsl(new->clock.update) <= SECOND_HAND_TIME);
if (new->clock.show_second_hand != current->clock.show_second_hand)
redisplay = TRUE;
}
CVS commit: src/lib
Module Name:src
Committed By: maya
Date: Mon Mar 4 08:22:19 UTC 2019
Modified Files:
src/lib: Makefile
Log Message:
revert previous.
This breaks 64bit builds, it attempts to build a compat library too
and it fails to find headers for it.
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.267 src/lib/Makefile:1.268
--- src/lib/Makefile:1.267 Sun Mar 3 17:55:04 2019
+++ src/lib/Makefile Mon Mar 4 08:22:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.267 2019/03/03 17:55:04 maya Exp $
+# $NetBSD: Makefile,v 1.268 2019/03/04 08:22:19 maya Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -171,10 +171,6 @@ SUBDIR+= ../external/gpl3/${EXTERNAL_GCC
# 2nd library dependency barrier
SUBDIR+= .WAIT
-.if (${MKLLVM} != "no")
-SUBDIR+= ../external/bsd/llvm/lib # depends on libexecinfo
-.endif
-
.for sanitizer in asan lsan ubsan
.if exists(../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/lib${sanitizer})
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/lib${sanitizer}
CVS import: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 4 08:21:06 UTC 2019 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21859 Log Message: initial import of pixman-0.38.0 Status: Vendor Tag: xorg Release Tags: pixman-0-38-0 U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/Makefile.in N xsrc/external/mit/pixman/dist/meson.build U xsrc/external/mit/pixman/dist/Makefile.win32.common U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/test-driver N xsrc/external/mit/pixman/dist/meson_options.txt U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/compile U xsrc/external/mit/pixman/dist/config.guess U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/Makefile.win32 U xsrc/external/mit/pixman/dist/demos/trap-test.c U xsrc/external/mit/pixman/dist/demos/Makefile.in U xsrc/external/mit/pixman/dist/demos/clip-test.c U xsrc/external/mit/pixman/dist/demos/clip-in.c N xsrc/external/mit/pixman/dist/demos/meson.build U xsrc/external/mit/pixman/dist/demos/conical-test.c U xsrc/external/mit/pixman/dist/demos/srgb-test.c U xsrc/external/mit/pixman/dist/demos/Makefile.am U xsrc/external/mit/pixman/dist/demos/tri-test.c U xsrc/external/mit/pixman/dist/demos/parrot.jpg U xsrc/external/mit/pixman/dist/demos/composite-test.c U xsrc/external/mit/pixman/dist/demos/screen-test.c U xsrc/external/mit/pixman/dist/demos/convolution-test.c U xsrc/external/mit/pixman/dist/demos/gtk-utils.c U xsrc/external/mit/pixman/dist/demos/gradient-test.c U xsrc/external/mit/pixman/dist/demos/srgb-trap-test.c U xsrc/external/mit/pixman/dist/demos/scale.c U xsrc/external/mit/pixman/dist/demos/radial-test.c U xsrc/external/mit/pixman/dist/demos/scale.ui U xsrc/external/mit/pixman/dist/demos/alpha-test.c U xsrc/external/mit/pixman/dist/demos/checkerboard.c U xsrc/external/mit/pixman/dist/demos/linear-gradient.c U xsrc/external/mit/pixman/dist/demos/quad2quad.c U xsrc/external/mit/pixman/dist/demos/parrot.c U xsrc/external/mit/pixman/dist/demos/gtk-utils.h U xsrc/external/mit/pixman/dist/test/thread-test.c U xsrc/external/mit/pixman/dist/test/check-formats.c U xsrc/external/mit/pixman/dist/test/pixel-test.c U xsrc/external/mit/pixman/dist/test/glyph-test.c U xsrc/external/mit/pixman/dist/test/Makefile.in U xsrc/external/mit/pixman/dist/test/utils.h N xsrc/external/mit/pixman/dist/test/meson.build U xsrc/external/mit/pixman/dist/test/cover-test.c U xsrc/external/mit/pixman/dist/test/scaling-test.c U xsrc/external/mit/pixman/dist/test/Makefile.am U xsrc/external/mit/pixman/dist/test/matrix-test.c U xsrc/external/mit/pixman/dist/test/alphamap.c U xsrc/external/mit/pixman/dist/test/fence-image-self-test.c U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c U xsrc/external/mit/pixman/dist/test/trap-crasher.c U xsrc/external/mit/pixman/dist/test/region-test.c U xsrc/external/mit/pixman/dist/test/affine-test.c U xsrc/external/mit/pixman/dist/test/region-translate-test.c U xsrc/external/mit/pixman/dist/test/radial-invalid.c U xsrc/external/mit/pixman/dist/test/utils.c U xsrc/external/mit/pixman/dist/test/a1-trap-test.c U xsrc/external/mit/pixman/dist/test/composite-traps-test.c U xsrc/external/mit/pixman/dist/test/radial-perf-test.c U xsrc/external/mit/pixman/dist/test/composite.c U xsrc/external/mit/pixman/dist/test/affine-bench.c U xsrc/external/mit/pixman/dist/test/oob-test.c U xsrc/external/mit/pixman/dist/test/blitters-test.c U xsrc/external/mit/pixman/dist/test/rotate-test.c U xsrc/external/mit/pixman/dist/test/scaling-bench.c U xsrc/external/mit/pixman/dist/test/tolerance-test.c U xsrc/external/mit/pixman/dist/test/stress-test.c U xsrc/external/mit/pixman/dist/test/combiner-test.c U xsrc/external/mit/pixman/dist/test/Makefile.sources U xsrc/external/mit/pixman/dist/test/solid-test.c U xsrc/external/mit/pixman/dist/test/utils-prng.c U xsrc/external/mit/pixman/dist/test/utils-prng.h U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c U xsrc/external/mit/pixman/dist/test/filter-reduction-test.c U xsrc/external/mit/pixman/dist/test/fetch-test.c U xsrc/external/mit/pixman/dist/test/region-contains-test.c U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c U xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c U xsrc/external/mit/pixman/dist/test/pdf-op-test.c U
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 4 08:21:01 UTC 2019 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv352 Log Message: initial import of libdrm-2.4.97 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-97 U xsrc/external/mit/libdrm/dist/meson_options.txt U xsrc/external/mit/libdrm/dist/libsync.h C xsrc/external/mit/libdrm/dist/xf86atomic.h U xsrc/external/mit/libdrm/dist/util_math.h U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/libdrm.pc.in C xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/config.h.in U xsrc/external/mit/libdrm/dist/aclocal.m4 U xsrc/external/mit/libdrm/dist/xf86drmMode.c U xsrc/external/mit/libdrm/dist/Makefile.sources U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/meson.build U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/xf86drmSL.c U xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/Makefile.am U xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/Makefile.in U xsrc/external/mit/libdrm/dist/xf86drmRandom.h U xsrc/external/mit/libdrm/dist/xf86drmHash.h U xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/build-aux/config.guess U xsrc/external/mit/libdrm/dist/build-aux/install-sh U xsrc/external/mit/libdrm/dist/build-aux/config.sub U xsrc/external/mit/libdrm/dist/build-aux/depcomp U xsrc/external/mit/libdrm/dist/build-aux/compile U xsrc/external/mit/libdrm/dist/build-aux/test-driver U xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh U xsrc/external/mit/libdrm/dist/build-aux/missing U xsrc/external/mit/libdrm/dist/tegra/tegra.c U xsrc/external/mit/libdrm/dist/tegra/tegra-symbol-check U xsrc/external/mit/libdrm/dist/tegra/tegra.h U xsrc/external/mit/libdrm/dist/tegra/libdrm_tegra.pc.in U xsrc/external/mit/libdrm/dist/tegra/meson.build U xsrc/external/mit/libdrm/dist/tegra/Makefile.am U xsrc/external/mit/libdrm/dist/tegra/private.h U xsrc/external/mit/libdrm/dist/tegra/Makefile.in U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in U xsrc/external/mit/libdrm/dist/amdgpu/meson.build U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.am U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.in U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbol-check U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/meson.build U xsrc/external/mit/libdrm/dist/freedreno/Makefile.am U xsrc/external/mit/libdrm/dist/freedreno/Makefile.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_bo.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_device.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_priv.h U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_device.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/msm_kgsl.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_priv.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_drm.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_pipe.c U xsrc/external/mit/libdrm/dist/include/drm/README U xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h U xsrc/external/mit/libdrm/dist/include/drm/drm.h U xsrc/external/mit/libdrm/dist/include/drm/qxl_drm.h U xsrc/external/mit/libdrm/dist/include/drm/sis_drm.h U
