From 45ebb6f2bb21bad85e6e72f4a7314b8748844909 Mon Sep 17 00:00:00 2001 From: Silenio Quarti Date: Mon, 17 Sep 2012 17:21:30 -0400 Subject: do not generate function count to avoid patch conflicts --- .../eclipse/swt/tools/internal/StatsGenerator.java | 25 ++++++++-------------- .../common/library/xpcom_stats.cpp | 5 +++-- .../common/library/xpcominit_stats.cpp | 7 +++--- .../Eclipse SWT OpenGL/carbon/library/agl_stats.c | 7 +++--- .../Eclipse SWT OpenGL/glx/library/glx_stats.c | 7 +++--- .../Eclipse SWT OpenGL/win32/library/wgl_stats.c | 7 +++--- .../Eclipse SWT PI/cairo/library/cairo_stats.c | 5 +++-- .../Eclipse SWT PI/carbon/library/cocoa_stats.c | 7 +++--- .../Eclipse SWT PI/carbon/library/os_stats.c | 7 +++--- .../Eclipse SWT PI/cocoa/library/os_stats.c | 5 +++-- .../Eclipse SWT PI/common/library/c_stats.c | 7 +++--- .../Eclipse SWT PI/gtk/library/atk_stats.c | 7 +++--- .../Eclipse SWT PI/gtk/library/os_stats.c | 5 +++-- .../Eclipse SWT PI/motif/library/os_stats.c | 7 +++--- .../Eclipse SWT PI/motif_gtk/library/gtk_stats.c | 7 +++--- .../Eclipse SWT PI/photon/library/os_stats.c | 7 +++--- .../Eclipse SWT PI/win32/library/com_stats.c | 7 +++--- .../Eclipse SWT PI/win32/library/gdip_stats.cpp | 7 +++--- .../Eclipse SWT PI/win32/library/os_stats.c | 5 +++-- .../Eclipse SWT PI/wpf/library/os_stats.cpp | 7 +++--- .../Eclipse SWT PI/wpf_win32/library/win32_stats.c | 7 +++--- .../Eclipse SWT Program/cde/library/cde_stats.c | 7 +++--- .../gnome/library/gnome_stats.c | 5 +++-- .../gtk/library/webkitgtk_stats.c | 5 +++-- .../win32/library/webkit_win32_stats.cpp | 5 +++-- 25 files changed, 97 insertions(+), 80 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java index dd8a6d1ec7..e45b6dc277 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java @@ -100,23 +100,7 @@ void generateSourceFile(JNIClass clazz) { outputln("#ifdef NATIVE_STATS"); outputln(); JNIMethod[] methods = clazz.getDeclaredMethods(); - int methodCount = 0; - for (int i = 0; i < methods.length; i++) { - JNIMethod method = methods[i]; - if ((method.getModifiers() & Modifier.NATIVE) == 0) continue; - methodCount++; - } String className = clazz.getSimpleName(); - output("int "); - output(className); - output("_nativeFunctionCount = "); - output(String.valueOf(methodCount)); - outputln(";"); - output("int "); - output(className); - output("_nativeFunctionCallCount["); - output(String.valueOf(methodCount)); - outputln("];"); output("char * "); output(className); outputln("_nativeFunctionNames[] = {"); @@ -143,6 +127,15 @@ void generateSourceFile(JNIClass clazz) { if (progress != null) progress.step(); } outputln("};"); + output("#define NATIVE_FUNCTION_COUNT sizeof("); + output(className); + outputln("_nativeFunctionNames) / sizeof(char*)"); + output("int "); + output(className); + outputln("_nativeFunctionCount = NATIVE_FUNCTION_COUNT;"); + output("int "); + output(className); + outputln("_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT];"); outputln(); generateStatsNatives(className); outputln(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp index d0977c1c4e..c8b5b7cebd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int XPCOM_nativeFunctionCount = 251; -int XPCOM_nativeFunctionCallCount[251]; char * XPCOM_nativeFunctionNames[] = { "CALLBACK_1JSNative", #ifndef JNI64 @@ -1141,6 +1139,9 @@ char * XPCOM_nativeFunctionNames[] = { "nsDynamicFunctionLoad_1sizeof", "strlen_1PRUnichar", }; +#define NATIVE_FUNCTION_COUNT sizeof(XPCOM_nativeFunctionNames) / sizeof(char*) +int XPCOM_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int XPCOM_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp index 84eb84c20f..79759b6def 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_stats.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int XPCOMInit_nativeFunctionCount = 5; -int XPCOMInit_nativeFunctionCallCount[5]; char * XPCOMInit_nativeFunctionNames[] = { "GREProperty_1sizeof", "GREVersionRange_1sizeof", @@ -23,6 +21,9 @@ char * XPCOMInit_nativeFunctionNames[] = { "_1XPCOMGlueShutdown", "_1XPCOMGlueStartup", }; +#define NATIVE_FUNCTION_COUNT sizeof(XPCOMInit_nativeFunctionNames) / sizeof(char*) +int XPCOMInit_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int XPCOMInit_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl_stats.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl_stats.c index 84f3dadae7..f2efcab64b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int AGL_nativeFunctionCount = 14; -int AGL_nativeFunctionCallCount[14]; char * AGL_nativeFunctionNames[] = { "aglChoosePixelFormat", "aglCreateContext", @@ -32,6 +30,9 @@ char * AGL_nativeFunctionNames[] = { "aglSwapBuffers", "aglUpdateContext", }; +#define NATIVE_FUNCTION_COUNT sizeof(AGL_nativeFunctionNames) / sizeof(char*) +int AGL_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int AGL_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_stats.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_stats.c index 1d62603f75..6fd31ebe45 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int GLX_nativeFunctionCount = 23; -int GLX_nativeFunctionCallCount[23]; char * GLX_nativeFunctionNames[] = { "XVisualInfo_1sizeof", "_1glGetIntegerv", @@ -41,6 +39,9 @@ char * GLX_nativeFunctionNames[] = { "_1glXWaitX", "memmove", }; +#define NATIVE_FUNCTION_COUNT sizeof(GLX_nativeFunctionNames) / sizeof(char*) +int GLX_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int GLX_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.c index cb879220c0..3e0ea08e0f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int WGL_nativeFunctionCount = 19; -int WGL_nativeFunctionCallCount[19]; char * WGL_nativeFunctionNames[] = { "ChoosePixelFormat", "DescribePixelFormat", @@ -37,6 +35,9 @@ char * WGL_nativeFunctionNames[] = { "wglShareLists", "wglSwapLayerBuffers", }; +#define NATIVE_FUNCTION_COUNT sizeof(WGL_nativeFunctionNames) / sizeof(char*) +int WGL_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int WGL_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c index 67b21fe5c2..dce4e6c014 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c @@ -24,8 +24,6 @@ #ifdef NATIVE_STATS -int Cairo_nativeFunctionCount = 157; -int Cairo_nativeFunctionCallCount[157]; char * Cairo_nativeFunctionNames[] = { "CAIRO_1VERSION_1ENCODE", "_1cairo_1append_1path", @@ -197,6 +195,9 @@ char * Cairo_nativeFunctionNames[] = { "memmove___3DJJ", #endif }; +#define NATIVE_FUNCTION_COUNT sizeof(Cairo_nativeFunctionNames) / sizeof(char*) +int Cairo_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int Cairo_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.c index 2261d5ca3d..34fa7cd272 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int Cocoa_nativeFunctionCount = 39; -int Cocoa_nativeFunctionCallCount[39]; char * Cocoa_nativeFunctionNames[] = { "HICocoaViewCreate", "HIJavaViewCreateWithCocoaView", @@ -61,6 +59,9 @@ char * Cocoa_nativeFunctionNames[] = { "objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I", "sel_1registerName", }; +#define NATIVE_FUNCTION_COUNT sizeof(Cocoa_nativeFunctionNames) / sizeof(char*) +int Cocoa_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int Cocoa_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c index b1a212bed4..ee81798078 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1016; -int OS_nativeFunctionCallCount[1016]; char * OS_nativeFunctionNames[] = { "AECoerceDesc", "AECountItems", @@ -1034,6 +1032,9 @@ char * OS_nativeFunctionNames[] = { "memmove___3C_3BI", "memmove___3ILorg_eclipse_swt_internal_carbon_TXNTab_2I", }; +#define NATIVE_FUNCTION_COUNT sizeof(OS_nativeFunctionNames) / sizeof(char*) +int OS_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int OS_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c index a8fae8b591..50bba2969c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 631; -int OS_nativeFunctionCallCount[631]; char * OS_nativeFunctionNames[] = { "ATSFontActivateFromFileReference", "AcquireRootMenu", @@ -1289,6 +1287,9 @@ char * OS_nativeFunctionNames[] = { "sel_1getName", "sel_1registerName", }; +#define NATIVE_FUNCTION_COUNT sizeof(OS_nativeFunctionNames) / sizeof(char*) +int OS_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int OS_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c index ee4a74d666..932c91cfbd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int C_nativeFunctionCount = 23; -int C_nativeFunctionCallCount[23]; char * C_nativeFunctionNames[] = { "PTR_1sizeof", "free", @@ -109,6 +107,9 @@ char * C_nativeFunctionNames[] = { "memset", "strlen", }; +#define NATIVE_FUNCTION_COUNT sizeof(C_nativeFunctionNames) / sizeof(char*) +int C_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int C_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c index 8563724bcb..9241309865 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -18,8 +18,6 @@ #ifdef NATIVE_STATS -int ATK_nativeFunctionCount = 78; -int ATK_nativeFunctionCallCount[78]; char * ATK_nativeFunctionNames[] = { "ATK_1IS_1NO_1OP_1OBJECT_1FACTORY", "ATK_1TYPE_1ACTION", @@ -232,6 +230,9 @@ char * ATK_nativeFunctionNames[] = { "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J", #endif }; +#define NATIVE_FUNCTION_COUNT sizeof(ATK_nativeFunctionNames) / sizeof(char*) +int ATK_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int ATK_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index 2dbd895edf..3a8fbd3211 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -18,8 +18,6 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1345; -int OS_nativeFunctionCallCount[1345]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -1727,6 +1725,9 @@ char * OS_nativeFunctionNames[] = { "realpath", "strcmp", }; +#define NATIVE_FUNCTION_COUNT sizeof(OS_nativeFunctionNames) / sizeof(char*) +int OS_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int OS_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.c index 543cf421a0..280dbb6add 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 467; -int OS_nativeFunctionCallCount[467]; char * OS_nativeFunctionNames[] = { "CODESET", "FD_1ISSET", @@ -485,6 +483,9 @@ char * OS_nativeFunctionNames[] = { "setlocale", "write", }; +#define NATIVE_FUNCTION_COUNT sizeof(OS_nativeFunctionNames) / sizeof(char*) +int OS_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int OS_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/gtk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/gtk_stats.c index 6e0ffa99f8..fe26c5cc16 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/gtk_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/gtk_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -18,8 +18,6 @@ #ifdef NATIVE_STATS -int GTK_nativeFunctionCount = 12; -int GTK_nativeFunctionCallCount[12]; char * GTK_nativeFunctionNames[] = { "_1GTK_1WIDGET_1HEIGHT", "_1GTK_1WIDGET_1WIDTH", @@ -34,6 +32,9 @@ char * GTK_nativeFunctionNames[] = { "_1gtk_1widget_1show_1now", "_1gtk_1window_1new", }; +#define NATIVE_FUNCTION_COUNT sizeof(GTK_nativeFunctionNames) / sizeof(char*) +int GTK_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int GTK_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.c index 02d502d1fe..8672d9f19c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 279; -int OS_nativeFunctionCallCount[279]; char * OS_nativeFunctionNames[] = { "PfDecomposeStemToID", "PfExtentText__Lorg_eclipse_swt_internal_photon_PhRect_1t_2Lorg_eclipse_swt_internal_photon_PhPoint_1t_2III", @@ -297,6 +295,9 @@ char * OS_nativeFunctionNames[] = { "strdup", "uname", }; +#define NATIVE_FUNCTION_COUNT sizeof(OS_nativeFunctionNames) / sizeof(char*) +int OS_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int OS_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c index ede775f0e1..c24ea8bf1d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int COM_nativeFunctionCount = 183; -int COM_nativeFunctionCallCount[183]; char * COM_nativeFunctionNames[] = { "AccessibleChildren", "AccessibleObjectFromWindow", @@ -577,6 +575,9 @@ char * COM_nativeFunctionNames[] = { "put_1accName_1CALLBACK", "put_1accValue_1CALLBACK", }; +#define NATIVE_FUNCTION_COUNT sizeof(COM_nativeFunctionNames) / sizeof(char*) +int COM_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int COM_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp index f1a626e70a..eb99e4093b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int Gdip_nativeFunctionCount = 186; -int Gdip_nativeFunctionCallCount[186]; char * Gdip_nativeFunctionNames[] = { "BitmapData_1delete", "BitmapData_1new", @@ -308,6 +306,9 @@ char * Gdip_nativeFunctionNames[] = { "TextureBrush_1delete", "TextureBrush_1new", }; +#define NATIVE_FUNCTION_COUNT sizeof(Gdip_nativeFunctionNames) / sizeof(char*) +int Gdip_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int Gdip_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c index 879d0d5ab2..724a3c517d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1071; -int OS_nativeFunctionCallCount[1071]; char * OS_nativeFunctionNames[] = { "ACCEL_1sizeof", "ACTCTX_1sizeof", @@ -2041,6 +2039,9 @@ char * OS_nativeFunctionNames[] = { "WindowFromPoint", "wcslen", }; +#define NATIVE_FUNCTION_COUNT sizeof(OS_nativeFunctionNames) / sizeof(char*) +int OS_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int OS_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp index 4e4ba519b1..2021e43a7e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1428; -int OS_nativeFunctionCallCount[1428]; char * OS_nativeFunctionNames[] = { "AccessText_1AccessKey", "AccessText_1Text", @@ -1446,6 +1444,9 @@ char * OS_nativeFunctionNames[] = { "memcpy___3BII", "memcpy___3CII", }; +#define NATIVE_FUNCTION_COUNT sizeof(OS_nativeFunctionNames) / sizeof(char*) +int OS_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int OS_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32_stats.c index f7b83f2cff..ad84c8f470 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int Win32_nativeFunctionCount = 26; -int Win32_nativeFunctionCallCount[26]; char * Win32_nativeFunctionNames[] = { "CloseHandle", "CreateCursor", @@ -44,6 +42,9 @@ char * Win32_nativeFunctionNames[] = { "ShellExecuteExW", "ToUnicode", }; +#define NATIVE_FUNCTION_COUNT sizeof(Win32_nativeFunctionNames) / sizeof(char*) +int Win32_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int Win32_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde_stats.c b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde_stats.c index 1011b90e10..3cd504ac04 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,8 +14,6 @@ #ifdef NATIVE_STATS -int CDE_nativeFunctionCount = 19; -int CDE_nativeFunctionCallCount[19]; char * CDE_nativeFunctionNames[] = { "DtActionArg_1sizeof", "_1DtActionInvoke", @@ -37,6 +35,9 @@ char * CDE_nativeFunctionNames[] = { "_1XtToolkitInitialize", "_1topLevelShellWidgetClass", }; +#define NATIVE_FUNCTION_COUNT sizeof(CDE_nativeFunctionNames) / sizeof(char*) +int CDE_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int CDE_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c index ca36b97f22..cef7ac33a9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c @@ -18,8 +18,6 @@ #ifdef NATIVE_STATS -int GNOME_nativeFunctionCount = 20; -int GNOME_nativeFunctionCallCount[20]; char * GNOME_nativeFunctionNames[] = { "GnomeVFSMimeApplication_1sizeof", "_1gnome_1icon_1lookup", @@ -42,6 +40,9 @@ char * GNOME_nativeFunctionNames[] = { "_1gnome_1vfs_1url_1show", "memmove", }; +#define NATIVE_FUNCTION_COUNT sizeof(GNOME_nativeFunctionNames) / sizeof(char*) +int GNOME_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int GNOME_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c index 6a0c3fcd2f..c0d22658fc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c @@ -18,8 +18,6 @@ #ifdef NATIVE_STATS -int WebKitGTK_nativeFunctionCount = 113; -int WebKitGTK_nativeFunctionCallCount[113]; char * WebKitGTK_nativeFunctionNames[] = { "JSClassDefinition_1sizeof", "_1JSClassCreate", @@ -135,6 +133,9 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1webkit_1web_1view_1stop_1loading", "memmove", }; +#define NATIVE_FUNCTION_COUNT sizeof(WebKitGTK_nativeFunctionNames) / sizeof(char*) +int WebKitGTK_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int WebKitGTK_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_stats.cpp index 071ae7f66b..d8a7edfa76 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_stats.cpp @@ -18,8 +18,6 @@ #ifdef NATIVE_STATS -int WebKit_win32_nativeFunctionCount = 60; -int WebKit_win32_nativeFunctionCallCount[60]; char * WebKit_win32_nativeFunctionNames[] = { "CFArrayGetCount", "CFArrayGetValueAtIndex", @@ -82,6 +80,9 @@ char * WebKit_win32_nativeFunctionNames[] = { "memmove", "willPerformClientRedirectToURL_1CALLBACK", }; +#define NATIVE_FUNCTION_COUNT sizeof(WebKit_win32_nativeFunctionNames) / sizeof(char*) +int WebKit_win32_nativeFunctionCount = NATIVE_FUNCTION_COUNT; +int WebKit_win32_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT]; #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func -- cgit