Merge ipx_pcb.h:1.24, spx_usrreq.c:1.67 from HEAD to RELENG_6:

Move spx_savesi from being a global variable to an automatically allocated
  variable on the spx_input() stack.  It's not very large, and this will
  avoid parallelism issues when spx_input() runs in more than one thread at
  a time.
This commit is contained in:
rwatson 2006-06-08 23:04:44 +00:00
parent 1fdce3be4a
commit be1414f73b
2 changed files with 3 additions and 3 deletions

View File

@ -1,8 +1,8 @@
/*-
* Copyright (c) 2004-2005 Robert N. M. Watson
* Copyright (c) 1995, Mike Mitchell
* Copyright (c) 1984, 1985, 1986, 1987, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1995, Mike Mitchell
* Copyright (c) 2004-2005 Robert N. M. Watson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions

View File

@ -70,7 +70,6 @@ static u_short spx_newchecks[50];
static int spx_hardnosed;
static int spx_use_delack = 0;
static int traceallspxs = 0;
static struct spx spx_savesi;
static struct spx_istat spx_istat;
/* Following was struct spxstat spxstat; */
@ -159,6 +158,7 @@ spx_input(m, ipxp)
register struct spxpcb *cb;
register struct spx *si = mtod(m, struct spx *);
register struct socket *so;
struct spx spx_savesi;
int dropsocket = 0;
short ostate = 0;