 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_jobs.c,v 1.6 2010/04/09 19:32:45 plunky Exp $	*/
+/*	$NetBSD: altq_jobs.c,v 1.7 2014/08/18 03:14:12 riastradh Exp $	*/
 /*	$KAME: altq_jobs.c,v 1.11 2005/04/13 03:44:25 suz Exp $	*/
 /*
  * Copyright (c) 2001, the Rector and Board of Visitors of the
  * University of Virginia.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms,
  * with or without modification, are permitted provided
  * that the following conditions are met:
+ *
  * Redistributions of source code must retain the above
  * copyright notice, this list of conditions and the following
  * disclaimer.
 @@ -49,27 +49,27 @@
  * Contributed by the Multimedia Networks Group at the University
  * of Virginia.
+ *
  * Papers and additional info can be found at
  * http://qosbox.cs.virginia.edu
+ *
  */
 /*
  * JoBS queue
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.6 2010/04/09 19:32:45 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.7 2014/08/18 03:14:12 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #endif
 #ifdef ALTQ_JOBS  /* jobs is enabled by ALTQ_JOBS option in opt_altq.h */
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 @@ -1148,27 +1148,27 @@ adjust_rates_rdc(struct jobs_if *jif)
 		    && (cl->cl_rin.bytes << SCALE_SHARE)/bk < min_share)
 			min_share = (cl->cl_rin.bytes << SCALE_SHARE)/bk;
 		if (is_backlogged && cl->concerned_rdc
 		    && cl->delay_prod_others > max_prod)
 			max_prod = cl->delay_prod_others;
 		if (is_backlogged && cl->concerned_rdc
 		    && cl->cl_rin.bytes > max_avg_pkt_size*cl->cl_rin.packets)
 			max_avg_pkt_size = (u_int64_t)((u_int)cl->cl_rin.bytes/(u_int)cl->cl_rin.packets);
+	}
 	error = update_error(jif);
 	if (!error)
-		return (NULL);
+		goto fail;
 	prop_control = (upper_bound*upper_bound*min_share)
 	    /(max_prod*(max_avg_pkt_size << 2));
 	prop_control = bps_to_internal(ticks_to_secs(prop_control)); /* in BT-1 */
 	credit = 0;
 	for (i = 0; i <= jif->jif_maxpri; i++) {
 		cl = jif->jif_classes[i];
 		class_exists = (cl != NULL);
 		is_backlogged = (class_exists && !qempty(cl->cl_q));
 		if (is_backlogged && cl->concerned_rdc) {
 			result[i] = -prop_control*error[i]; /* in BT-1 */
 @@ -1242,26 +1242,29 @@ adjust_rates_rdc(struct jobs_if *jif)
 		if (is_backlogged && cl->concerned_rdc) {
 			available = result[i]
 			    + cl->service_rate-cl->min_rate_adc;
 			if (available >= -credit) {
 				result[i] += credit;
 				credit = 0;
 			} else {
 				result[i] -= available;
 				credit += available;
+			}
+		}
+	}
 	return result;
 fail:	free(result, M_DEVBUF);
 	return NULL;
+}
 /*
  * assign_rate_drops_adc: returns the adjustment needed to
  * the service rates to meet the absolute delay/rate constraints
  * (delay/throughput bounds) and drops traffic if need be.
  * see tech. report UVA/T.R. CS-2000-24/CS-2001-21 for more info.
  */
 static int64_t *
 assign_rate_drops_adc(struct jobs_if *jif)
+{
 	int64_t *result;
 @@ -1274,39 +1277,39 @@ assign_rate_drops_adc(struct jobs_if *ji
 	int lowest, highest;
 	int keep_going;
 	int i;
 	u_int64_t now, oldest_arv;
 	int64_t	remaining_time;
 	struct mbuf* pkt;
 	u_int64_t len;
 	now = read_machclk();
 	oldest_arv = now;
 	result = malloc((jif->jif_maxpri+1)*sizeof(int64_t), M_DEVBUF, M_WAITOK);
 	if (result == NULL)
-		return NULL;
+		goto fail0;
 	c = malloc((jif->jif_maxpri+1)*sizeof(u_int64_t), M_DEVBUF, M_WAITOK);
 	if (c == NULL)
-		return NULL;
+		goto fail1;
 	n = malloc((jif->jif_maxpri+1)*sizeof(u_int64_t), M_DEVBUF, M_WAITOK);
 	if (n == NULL)
-		return NULL;
+		goto fail2;
 	k = malloc((jif->jif_maxpri+1)*sizeof(u_int64_t), M_DEVBUF, M_WAITOK);
 	if (k == NULL)
-		return NULL;
+		goto fail3;
 	available = malloc((jif->jif_maxpri+1)*sizeof(int64_t), M_DEVBUF, M_WAITOK);
 	if (available == NULL)
-		return NULL;
+		goto fail4;
 	for (i = 0; i <= jif->jif_maxpri; i++)
 		result[i] = 0;
 	keep_going = 1;
 	for (i = 0; i <= jif->jif_maxpri; i++) {
 		cl = jif->jif_classes[i];
 		class_exists = (cl != NULL);
 		is_backlogged = (class_exists && !qempty(cl->cl_q));
 		if (is_backlogged) {
 			if (cl->concerned_adc) {
 @@ -1515,26 +1518,34 @@ assign_rate_drops_adc(struct jobs_if *ji
 			cl->min_rate_adc = n[i]; /* the best we can give */
 		else {
 			if (class_exists)
 				cl->min_rate_adc = 0;
+		}
+	}
 	free(c, M_DEVBUF);
 	free(n, M_DEVBUF);
 	free(k, M_DEVBUF);
 	free(available, M_DEVBUF);
 	return (result);
 fail5: __unused
 	free(available, M_DEVBUF);
 fail4:	free(k, M_DEVBUF);
 fail3:	free(n, M_DEVBUF);
 fail2:	free(c, M_DEVBUF);
 fail1:	free(result, M_DEVBUF);
 fail0:	return NULL;
+}
 /*
  * update_error: returns the difference between the mean weighted
  * delay and the weighted delay for each class. if proportional
  * delay differentiation is perfectly achieved, it should return
  * zero for each class.
  */
 static int64_t *
 update_error(struct jobs_if *jif)
+{
 	int i;
 	int active_classes, backlogged_classes;