Date: Fri, 18 Jan 2013 09:56:50 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245594 - projects/counters/sys/kern Message-ID: <201301180956.r0I9uoe3041720@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Fri Jan 18 09:56:50 2013 New Revision: 245594 URL: http://svnweb.freebsd.org/changeset/base/245594 Log: Style Modified: projects/counters/sys/kern/subr_counter.c Modified: projects/counters/sys/kern/subr_counter.c ============================================================================== --- projects/counters/sys/kern/subr_counter.c Fri Jan 18 08:34:50 2013 (r245593) +++ projects/counters/sys/kern/subr_counter.c Fri Jan 18 09:56:50 2013 (r245594) @@ -22,13 +22,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> -#include <sys/kernel.h> #include <sys/counter.h> +#include <sys/kernel.h> +#include <sys/smp.h> #include <vm/uma.h> static uma_zone_t uint64_pcpu_zone; @@ -36,8 +38,9 @@ static uma_zone_t uint64_pcpu_zone; void counter_u64_zero(counter_u64_t c) { + int i; - for (int i = 0; i < mp_ncpus; i++) + for (i = 0; i < mp_ncpus; i++) *(uint64_t *)((char *)c + sizeof(struct pcpu) * i) = 0; } @@ -45,9 +48,10 @@ uint64_t counter_u64_fetch(counter_u64_t c) { uint64_t r; + int i; r = 0; - for (int i = 0; i < mp_ncpus; i++) + for (i = 0; i < mp_ncpus; i++) r += *(uint64_t *)((char *)c + sizeof(struct pcpu) * i); return (r); @@ -59,7 +63,7 @@ counter_u64_alloc(int flags) counter_u64_t r; r = uma_zalloc(uint64_pcpu_zone, flags); - if (r) + if (r != NULL) counter_u64_zero(r); return (r);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301180956.r0I9uoe3041720>