Changeset 60297f56

Timestamp:

Dec 13, 2011 9:19:32 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

27f0587

Parents:

c92c664

Message:

• GeoIP: Buffer input to speed lookup by 10x

File:

• router/java/src/net/i2p/router/transport/GeoIP.java (modified) (8 diffs)

router/java/src/net/i2p/router/transport/GeoIP.java

@@ -19 +19 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
@@ -42 +43 @@
 class GeoIP {
     private final Log _log;
+    // change to test with main()
+    //private final I2PAppContext _context;
     private final RouterContext _context;
     private final Map<String, String> _codeToName;
@@ -52 +55 @@
     private int _lookupRunCount;
     
+    //public GeoIP(I2PAppContext context) {
     public GeoIP(RouterContext context) {
         _context = context;
@@ -219 +223 @@
         try {
             in = new FileInputStream(GeoFile);
-            StringBuilder buf = new StringBuilder(128);
-            while (DataHelper.readLine(in, buf) && idx < search.length) {
+            String buf = null;
+            BufferedReader br = new BufferedReader(new InputStreamReader(in, "ISO-8859-1"));
+            while ((buf = br.readLine()) != null && idx < search.length) {
                 try {
                     if (buf.charAt(0) == '#') {
-                        buf.setLength(0);
                         continue;
                     }
-                    String[] s = buf.toString().split(",");
+                    String[] s = buf.split(",");
                     long ip1 = Long.parseLong(s[0]);
                     long ip2 = Long.parseLong(s[1]);
@@ -243 +247 @@
                 } catch (NumberFormatException nfe) {
                 }
-                buf.setLength(0);
             }
         } catch (IOException ioe) {
@@ -263 +266 @@
      */
     private void updateOurCountry() {
+        /**** comment out to test with main() */
         String oldCountry = _context.router().getConfigSetting(PROP_IP_COUNTRY);
         Hash ourHash = _context.routerHash();
@@ -273 +277 @@
             _context.router().saveConfig();
         }
+        /****/
     }
 
@@ -357 +362 @@
         for (int i = 0; i < tests.length; i++)
             g.add(tests[i]);
+        long start = System.currentTimeMillis();
         g.blockingLookup();
+        System.out.println("Lookup took " + (System.currentTimeMillis() - start));
         for (int i = 0; i < tests.length; i++)
             System.out.println(tests[i] + " : " + g.get(tests[i]));