Attachment #637822 for bug #659488

Lines 52-58 Link Here

(-)dahdi-linux-3.1.0.orig/drivers/dahdi/opvxd115/vpm450m.c (-1 / +1 lines)
52	#else	52	#else
53	ktime_get_real_ts64(&tv);	53	ktime_get_real_ts64(&tv);
54	total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) +	54	total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) +
55	(((unsigned long long)(tv.tv_nsec))) / 1000;	55	((unsigned long long)(tv.tv_nsec / 1000));
56	#endif	56	#endif
57	f_pTime->aulWallTimeUs[0] = (total_usecs & mask);	57	f_pTime->aulWallTimeUs[0] = (total_usecs & mask);
58	f_pTime->aulWallTimeUs[1] = (total_usecs >> 32);	58	f_pTime->aulWallTimeUs[1] = (total_usecs >> 32);

Lines 1762-1772 Link Here

(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xbus-core.c (-3 / +5 lines)
1762		1762
1763	static void xbus_fill_proc_queue(struct seq_file sfile, struct xframe_queue q)	1763	static void xbus_fill_proc_queue(struct seq_file sfile, struct xframe_queue q)
1764	{	1764	{
		1765	s32 lag_us_rem;
		1766	s64 lag_ms = div_s64_rem(q->worst_lag_usec, 1000, &lag_us_rem);
		1767
1765	seq_printf(sfile,	1768	seq_printf(sfile,
1766	"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",	1769	"%-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%03d ms\n",
1767	q->name, q->steady_state_count, q->count, q->max_count,	1770	q->name, q->steady_state_count, q->count, q->max_count,
1768	q->worst_count, q->overflows, q->worst_lag_usec / 1000,	1771	q->worst_count, q->overflows, lag_ms, lag_us_rem);
1769	q->worst_lag_usec % 1000);
1770	xframe_queue_clearstats(q);	1772	xframe_queue_clearstats(q);
1771	}	1773	}
1772		1774

Lines 129-135 Link Here

(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xbus-pcm.c (-2 / +2 lines)
129	usec = ktime_us_delta(ticker->last_sample,	129	usec = ktime_us_delta(ticker->last_sample,
130	ticker->first_sample);	130	ticker->first_sample);
131	ticker->first_sample = ticker->last_sample;	131	ticker->first_sample = ticker->last_sample;
132	ticker->tick_period = usec / ticker->cycle;	132	ticker->tick_period = div_s64(usec, ticker->cycle);
133	cycled = 1;	133	cycled = 1;
134	}	134	}
135	ticker->count++;	135	ticker->count++;
Lines 497-503 Link Here
497	XBUS_DBG(SYNC, xbus,	497	XBUS_DBG(SYNC, xbus,
498	"%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n",	498	"%sDRIFT adjust %s (%d) (last update %lld seconds ago)\n",
499	(disable_pll_sync) ? "Fake " : "", msg, drift,	499	(disable_pll_sync) ? "Fake " : "", msg, drift,
500	msec_delta / MSEC_PER_SEC);	500	div_s64(msec_delta, MSEC_PER_SEC));
501	if (!disable_pll_sync)	501	if (!disable_pll_sync)
502	CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL,	502	CALL_PROTO(GLOBAL, SYNC_SOURCE, xbus, NULL, SYNC_MODE_PLL,
503	drift);	503	drift);

Lines 249-255 Link Here

(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xbus-sysfs.c (-1 / +1 lines)
249	/*	249	/*
250	* Calculate lost ticks time	250	* Calculate lost ticks time
251	*/	251	*/
252	seconds = ktime_ms_delta(now, di->last_lost_tick) / 1000;	252	seconds = div_s64(ktime_ms_delta(now, di->last_lost_tick), 1000);
253	minutes = seconds / 60;	253	minutes = seconds / 60;
254	seconds = seconds % 60;	254	seconds = seconds % 60;
255	hours = minutes / 60;	255	hours = minutes / 60;




	       THIS_MODULE->name, q->name);
	list_for_each_entry_reverse(xframe, &q->head, frame_list) {
		xpacket_t *pack = (xpacket_t *)&xframe->packets[0];
		s32 usec_rem;
		s64 msec = div_s64_rem(ktime_us_delta(now, xframe->kt_queued), 1000, &usec_rem);

		snprintf(prefix, ARRAY_SIZE(prefix), "  %3d> %5lld.%03d msec",
			 i++, msec, usec_rem);
		dump_packet(prefix, pack, 1);
	}
}

	if (q->count >= q->max_count) {
		q->overflows++;
		if ((overflow_cnt++ % 1000) < 5) {
			s32 lag_us_rem;
			s64 lag_ms = div_s64_rem(q->worst_lag_usec, 1000, &lag_us_rem);

			NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%03d ms\n",
			     q->name, q->steady_state_count, q->count,
			     q->max_count, q->worst_count, q->overflows,
			     lag_ms, lag_us_rem);
			     q->worst_lag_usec % 1000);
			__xframe_dump_queue(q);
		}
		ret = 0;

Return to bug 659488

Lines 40-49 Link Here

(-)dahdi-linux-3.1.0.orig/drivers/dahdi/xpp/xframe_queue.c (-6 / +9 lines)
40	THIS_MODULE->name, q->name);	40	THIS_MODULE->name, q->name);
41	list_for_each_entry_reverse(xframe, &q->head, frame_list) {	41	list_for_each_entry_reverse(xframe, &q->head, frame_list) {
42	xpacket_t pack = (xpacket_t )&xframe->packets[0];	42	xpacket_t pack = (xpacket_t )&xframe->packets[0];
43	s64 usec = ktime_us_delta(now, xframe->kt_queued);	43	s32 usec_rem;
		44	s64 msec = div_s64_rem(ktime_us_delta(now, xframe->kt_queued), 1000, &usec_rem);
44		45
45	snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03lld msec",	46	snprintf(prefix, ARRAY_SIZE(prefix), " %3d> %5lld.%03d msec",
46	i++, usec / 1000, usec % 1000);	47	i++, msec, usec_rem);
47	dump_packet(prefix, pack, 1);	48	dump_packet(prefix, pack, 1);
48	}	49	}
49	}	50	}
Lines 60-70 Link Here
60	if (q->count >= q->max_count) {	61	if (q->count >= q->max_count) {
61	q->overflows++;	62	q->overflows++;
62	if ((overflow_cnt++ % 1000) < 5) {	63	if ((overflow_cnt++ % 1000) < 5) {
63	NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%lld ms\n",	64	s32 lag_us_rem;
		65	s64 lag_ms = div_s64_rem(q->worst_lag_usec, 1000, &lag_us_rem);
		66
		67	NOTICE("Overflow of %-15s: counts %3d, %3d, %3d worst %3d, overflows %3d worst_lag %02lld.%03d ms\n",
64	q->name, q->steady_state_count, q->count,	68	q->name, q->steady_state_count, q->count,
65	q->max_count, q->worst_count, q->overflows,	69	q->max_count, q->worst_count, q->overflows,
66	q->worst_lag_usec / 1000,	70	lag_ms, lag_us_rem);
67	q->worst_lag_usec % 1000);
68	__xframe_dump_queue(q);	71	__xframe_dump_queue(q);
69	}	72	}
70	ret = 0;	73	ret = 0;