1.2: optimize io, time gain 50-70%

zvezdochiot · zvezdochiot · commit cdc05df5cd44 · 2019-12-15T00:45:39.000+03:00
diff --git a/hammingdec.c b/hammingdec.c
@@ -80,10 +80,9 @@ int main(int argc, char *argv[])
     if(c == 8)
     {
         int x, kod[12], g = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             for(int i = 0; i < 8; i++)
             {
@@ -104,15 +103,15 @@ int main(int argc, char *argv[])
                 fputc(todec(byte), t);
                 g = 0;
             }
+            x = fgetc(f);
         }
     }
     else if(c == 12)
     {
         int tmp[4], x, kod[17], g = 0, flag = 0, schet = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             kod[g] = byte[7];
             g++;
@@ -154,15 +153,15 @@ int main(int argc, char *argv[])
                 g = 0;
             }
             schet++; //костыль 3
+            x = fgetc(f);
         }
     }
     else if(c == 16)
     {
         int x, kod[21], g = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             for(int i = 0; i < 8; i++)
             {
@@ -184,15 +183,15 @@ int main(int argc, char *argv[])
                     }
                 }
             }
+            x = fgetc(f);
         }
     }
     else if(c == 32)
     {
         int x, kod[38], g = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             for(int i = 0; i < 8; i++)
             {
@@ -214,15 +213,15 @@ int main(int argc, char *argv[])
                     }
                 }
             }
+            x = fgetc(f);
         }
     }
     else if(c == 64)
     {
         int x, kod[71], g = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             for(int i = 0; i < 8; i++)
             {
@@ -244,6 +243,7 @@ int main(int argc, char *argv[])
                     }
                 }
             }
+            x = fgetc(f);
         }
     }
     else
diff --git a/hammingenc.c b/hammingenc.c
@@ -76,10 +76,9 @@ int main(int argc, char *argv[])
     if(c == 8)
     {
         int x, kod[12];
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             int g = 0;
             for(int i = 0; i < 12; i++)
@@ -102,18 +101,18 @@ int main(int argc, char *argv[])
                 }
                 fputc(todec(byte), t);
             }
+            x = fgetc(f);
         }
     }
     else if(c == 12)
     {
         int x, kod[17], g = 0, flag = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
+			tobit(x, byte);
             if(flag == 0)
             {
-                fseek(f, -1, SEEK_CUR);
-                x = fgetc(f);
-                tobit(x, byte);
                 for(int i = 0; i < 8; i++)
                 {
                     if((g != 0)&&(g != 1)&&(g != 3)&&(g != 7)&&(g != 15)&&(g != 31)&&(g != 63))
@@ -143,9 +142,6 @@ int main(int argc, char *argv[])
             }
             else if(flag == 1)
             {
-                fseek(f, -1, SEEK_CUR);
-                x = fgetc(f);
-                tobit(x, byte);
                 for(int i = 4; i < 8; i++)
                 {
                     if((g != 0)&&(g != 1)&&(g != 3)&&(g != 7)&&(g != 15)&&(g != 31)&&(g != 63))
@@ -189,15 +185,15 @@ int main(int argc, char *argv[])
                 }
                 g = 0;
             }
+            x = fgetc(f);
         }
     }
     else if(c == 16)
     {
         int x, kod[21], g = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             for(int i = 0; i < 8; i++)
             {
@@ -227,15 +223,15 @@ int main(int argc, char *argv[])
                 }
                 g = 0;
             }
+            x = fgetc(f);
         }
     }
     else if(c == 32)
     {
         int x, kod[38], g = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             for(int i = 0; i < 8; i++)
             {
@@ -265,15 +261,15 @@ int main(int argc, char *argv[])
                 }
                 g = 0;
             }
+            x = fgetc(f);
         }
     }
     else if(c == 64)
     {
         int x, kod[71], g = 0;
-        while(fgetc(f) != EOF)
+        x = fgetc(f);
+        while(x != EOF)
         {
-            fseek(f, -1, SEEK_CUR);
-            x = fgetc(f);
             tobit(x, byte);
             for(int i = 0; i < 8; i++)
             {
@@ -303,6 +299,7 @@ int main(int argc, char *argv[])
                 }
                 g = 0;
             }
+            x = fgetc(f);
         }
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,9 @@ int main(int argc, char *argv[])`
`80`	`80`	`if(c == 8)`
`81`	`81`	`{`
`82`	`82`	`int x, kod[12], g = 0;`
`83`		`- while(fgetc(f) != EOF)`
	`83`	`+ x = fgetc(f);`
	`84`	`+ while(x != EOF)`
`84`	`85`	`{`
`85`		`- fseek(f, -1, SEEK_CUR);`
`86`		`- x = fgetc(f);`
`87`	`86`	`tobit(x, byte);`
`88`	`87`	`for(int i = 0; i < 8; i++)`
`89`	`88`	`{`
`@@ -104,15 +103,15 @@ int main(int argc, char *argv[])`
`104`	`103`	`fputc(todec(byte), t);`
`105`	`104`	`g = 0;`
`106`	`105`	`}`
	`106`	`+ x = fgetc(f);`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`else if(c == 12)`
`110`	`110`	`{`
`111`	`111`	`int tmp[4], x, kod[17], g = 0, flag = 0, schet = 0;`
`112`		`- while(fgetc(f) != EOF)`
	`112`	`+ x = fgetc(f);`
	`113`	`+ while(x != EOF)`
`113`	`114`	`{`
`114`		`- fseek(f, -1, SEEK_CUR);`
`115`		`- x = fgetc(f);`
`116`	`115`	`tobit(x, byte);`
`117`	`116`	`kod[g] = byte[7];`
`118`	`117`	`g++;`
`@@ -154,15 +153,15 @@ int main(int argc, char *argv[])`
`154`	`153`	`g = 0;`
`155`	`154`	`}`
`156`	`155`	`schet++; //костыль 3`
	`156`	`+ x = fgetc(f);`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`else if(c == 16)`
`160`	`160`	`{`
`161`	`161`	`int x, kod[21], g = 0;`
`162`		`- while(fgetc(f) != EOF)`
	`162`	`+ x = fgetc(f);`
	`163`	`+ while(x != EOF)`
`163`	`164`	`{`
`164`		`- fseek(f, -1, SEEK_CUR);`
`165`		`- x = fgetc(f);`
`166`	`165`	`tobit(x, byte);`
`167`	`166`	`for(int i = 0; i < 8; i++)`
`168`	`167`	`{`
`@@ -184,15 +183,15 @@ int main(int argc, char *argv[])`
`184`	`183`	`}`
`185`	`184`	`}`
`186`	`185`	`}`
	`186`	`+ x = fgetc(f);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`else if(c == 32)`
`190`	`190`	`{`
`191`	`191`	`int x, kod[38], g = 0;`
`192`		`- while(fgetc(f) != EOF)`
	`192`	`+ x = fgetc(f);`
	`193`	`+ while(x != EOF)`
`193`	`194`	`{`
`194`		`- fseek(f, -1, SEEK_CUR);`
`195`		`- x = fgetc(f);`
`196`	`195`	`tobit(x, byte);`
`197`	`196`	`for(int i = 0; i < 8; i++)`
`198`	`197`	`{`
`@@ -214,15 +213,15 @@ int main(int argc, char *argv[])`
`214`	`213`	`}`
`215`	`214`	`}`
`216`	`215`	`}`
	`216`	`+ x = fgetc(f);`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`	`else if(c == 64)`
`220`	`220`	`{`
`221`	`221`	`int x, kod[71], g = 0;`
`222`		`- while(fgetc(f) != EOF)`
	`222`	`+ x = fgetc(f);`
	`223`	`+ while(x != EOF)`
`223`	`224`	`{`
`224`		`- fseek(f, -1, SEEK_CUR);`
`225`		`- x = fgetc(f);`
`226`	`225`	`tobit(x, byte);`
`227`	`226`	`for(int i = 0; i < 8; i++)`
`228`	`227`	`{`
`@@ -244,6 +243,7 @@ int main(int argc, char *argv[])`
`244`	`243`	`}`
`245`	`244`	`}`
`246`	`245`	`}`
	`246`	`+ x = fgetc(f);`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`	`else`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,9 @@ int main(int argc, char *argv[])`
`76`	`76`	`if(c == 8)`
`77`	`77`	`{`
`78`	`78`	`int x, kod[12];`
`79`		`- while(fgetc(f) != EOF)`
	`79`	`+ x = fgetc(f);`
	`80`	`+ while(x != EOF)`
`80`	`81`	`{`
`81`		`- fseek(f, -1, SEEK_CUR);`
`82`		`- x = fgetc(f);`
`83`	`82`	`tobit(x, byte);`
`84`	`83`	`int g = 0;`
`85`	`84`	`for(int i = 0; i < 12; i++)`
`@@ -102,18 +101,18 @@ int main(int argc, char *argv[])`
`102`	`101`	`}`
`103`	`102`	`fputc(todec(byte), t);`
`104`	`103`	`}`
	`104`	`+ x = fgetc(f);`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`else if(c == 12)`
`108`	`108`	`{`
`109`	`109`	`int x, kod[17], g = 0, flag = 0;`
`110`		`- while(fgetc(f) != EOF)`
	`110`	`+ x = fgetc(f);`
	`111`	`+ while(x != EOF)`
`111`	`112`	`{`
	`113`	`+ tobit(x, byte);`
`112`	`114`	`if(flag == 0)`
`113`	`115`	`{`
`114`		`- fseek(f, -1, SEEK_CUR);`
`115`		`- x = fgetc(f);`
`116`		`- tobit(x, byte);`
`117`	`116`	`for(int i = 0; i < 8; i++)`
`118`	`117`	`{`
`119`	`118`	`if((g != 0)&&(g != 1)&&(g != 3)&&(g != 7)&&(g != 15)&&(g != 31)&&(g != 63))`
`@@ -143,9 +142,6 @@ int main(int argc, char *argv[])`
`143`	`142`	`}`
`144`	`143`	`else if(flag == 1)`
`145`	`144`	`{`
`146`		`- fseek(f, -1, SEEK_CUR);`
`147`		`- x = fgetc(f);`
`148`		`- tobit(x, byte);`
`149`	`145`	`for(int i = 4; i < 8; i++)`
`150`	`146`	`{`
`151`	`147`	`if((g != 0)&&(g != 1)&&(g != 3)&&(g != 7)&&(g != 15)&&(g != 31)&&(g != 63))`
`@@ -189,15 +185,15 @@ int main(int argc, char *argv[])`
`189`	`185`	`}`
`190`	`186`	`g = 0;`
`191`	`187`	`}`
	`188`	`+ x = fgetc(f);`
`192`	`189`	`}`
`193`	`190`	`}`
`194`	`191`	`else if(c == 16)`
`195`	`192`	`{`
`196`	`193`	`int x, kod[21], g = 0;`
`197`		`- while(fgetc(f) != EOF)`
	`194`	`+ x = fgetc(f);`
	`195`	`+ while(x != EOF)`
`198`	`196`	`{`
`199`		`- fseek(f, -1, SEEK_CUR);`
`200`		`- x = fgetc(f);`
`201`	`197`	`tobit(x, byte);`
`202`	`198`	`for(int i = 0; i < 8; i++)`
`203`	`199`	`{`
`@@ -227,15 +223,15 @@ int main(int argc, char *argv[])`
`227`	`223`	`}`
`228`	`224`	`g = 0;`
`229`	`225`	`}`
	`226`	`+ x = fgetc(f);`
`230`	`227`	`}`
`231`	`228`	`}`
`232`	`229`	`else if(c == 32)`
`233`	`230`	`{`
`234`	`231`	`int x, kod[38], g = 0;`
`235`		`- while(fgetc(f) != EOF)`
	`232`	`+ x = fgetc(f);`
	`233`	`+ while(x != EOF)`
`236`	`234`	`{`
`237`		`- fseek(f, -1, SEEK_CUR);`
`238`		`- x = fgetc(f);`
`239`	`235`	`tobit(x, byte);`
`240`	`236`	`for(int i = 0; i < 8; i++)`
`241`	`237`	`{`
`@@ -265,15 +261,15 @@ int main(int argc, char *argv[])`
`265`	`261`	`}`
`266`	`262`	`g = 0;`
`267`	`263`	`}`
	`264`	`+ x = fgetc(f);`
`268`	`265`	`}`
`269`	`266`	`}`
`270`	`267`	`else if(c == 64)`
`271`	`268`	`{`
`272`	`269`	`int x, kod[71], g = 0;`
`273`		`- while(fgetc(f) != EOF)`
	`270`	`+ x = fgetc(f);`
	`271`	`+ while(x != EOF)`
`274`	`272`	`{`
`275`		`- fseek(f, -1, SEEK_CUR);`
`276`		`- x = fgetc(f);`
`277`	`273`	`tobit(x, byte);`
`278`	`274`	`for(int i = 0; i < 8; i++)`
`279`	`275`	`{`
`@@ -303,6 +299,7 @@ int main(int argc, char *argv[])`
`303`	`299`	`}`
`304`	`300`	`g = 0;`
`305`	`301`	`}`
	`302`	`+ x = fgetc(f);`
`306`	`303`	`}`
`307`	`304`	`}`
`308`	`305`	`else`