Index: trunk/src_plugins/diag/diag.c
===================================================================
--- trunk/src_plugins/diag/diag.c	(revision 21757)
+++ trunk/src_plugins/diag/diag.c	(revision 21758)
@@ -411,7 +411,7 @@
 	return 0;
 }
 
-extern void pcb_lookup_conn_by_pin(int type, void *ptr1);
+#include "find.h"
 static const char pcb_acts_FindPerf[] = "findperf()\n";
 static const char pcb_acth_FindPerf[] = "Measure the peformance of find.c";
 static fgw_error_t pcb_act_FindPerf(fgw_arg_t *res, int argc, fgw_arg_t *argv)
@@ -448,6 +448,45 @@
 	return 0;
 }
 
+static const char pcb_acts_Find2Perf[] = "find2perf()\n";
+static const char pcb_acth_Find2Perf[] = "Measure the peformance of find2.c";
+static fgw_error_t pcb_act_Find2Perf(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	double from, now, end, duration = 4.0;
+	long its = 0, pins = 0;
+	pcb_find_t fctx;
+
+	memset(&fctx, 0, sizeof(fctx));
+
+	PCB_SUBC_LOOP(PCB->Data) {
+		PCB_PADSTACK_LOOP(subc->data) {
+			pins++;
+		}
+		PCB_END_LOOP;
+	}
+	PCB_END_LOOP;
+
+	pcb_message(PCB_MSG_INFO, "Measuring find.c peformance for %f seconds starting from %ld pins...\n", duration, pins);
+
+	from = pcb_dtime();
+	end = from + duration;
+	do {
+		PCB_SUBC_LOOP(PCB->Data) {
+			PCB_PADSTACK_LOOP(subc->data) {
+				pcb_find_from_obj(&fctx, PCB->Data, padstack);
+				pcb_find_free(&fctx);
+			}
+			PCB_END_LOOP;
+		}
+		PCB_END_LOOP;
+		its++;
+		now = pcb_dtime();
+	} while(now < end);
+	pcb_message(PCB_MSG_INFO, "find2.c peformance: %f pin find per second\n", (double)its * (double)pins / (now-from));
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
 #define	PCB_FORCECOLOR_TYPES        \
 	(PCB_OBJ_PSTK | PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC_PART | PCB_OBJ_SUBC | PCB_OBJ_RAT)
 
@@ -487,6 +526,7 @@
 	{"EvalConf", pcb_act_EvalConf, pcb_acth_EvalConf, pcb_acts_EvalConf},
 	{"d1", pcb_act_d1, pcb_acth_d1, pcb_acts_d1},
 	{"findperf", pcb_act_FindPerf, pcb_acth_FindPerf, pcb_acts_FindPerf},
+	{"find2perf", pcb_act_Find2Perf, pcb_acth_Find2Perf, pcb_acts_Find2Perf},
 	{"integrity", pcb_act_integrity, integrity_help, integrity_syntax},
 	{"dumpflags", pcb_act_dumpflags, pcb_acth_dumpflags, pcb_acts_dumpflags},
 	{"forcecolor", pcb_act_forcecolor, pcb_acth_forcecolor, pcb_acts_forcecolor}