diff --git a/__pycache__/h2inc.cpython-35.pyc b/__pycache__/h2inc.cpython-35.pyc index 57272df..1df678b 100644 Binary files a/__pycache__/h2inc.cpython-35.pyc and b/__pycache__/h2inc.cpython-35.pyc differ diff --git a/__pycache__/h2inc_gui.cpython-35.pyc b/__pycache__/h2inc_gui.cpython-35.pyc index 2f74536..38443b4 100644 Binary files a/__pycache__/h2inc_gui.cpython-35.pyc and b/__pycache__/h2inc_gui.cpython-35.pyc differ diff --git a/async_multiprocessing_test.py b/async_multiprocessing_test.py new file mode 100644 index 0000000..6d03b72 --- /dev/null +++ b/async_multiprocessing_test.py @@ -0,0 +1,34 @@ +import multiprocessing as mp +import random +import string + +random.seed(123) + +# Define an output queue +output = mp.Queue() + +# define a example function +def rand_string(length, output): + """ Generates a random string of numbers, lower- and uppercase chars. """ + rand_str = ''.join(random.choice( + string.ascii_lowercase + + string.ascii_uppercase + + string.digits) + for i in range(length)) + output.put(rand_str) + +# Setup a list of processes that we want to run +processes = [mp.Process(target=rand_string, args=(5, output)) for x in range(4)] + +# Run processes +for p in processes: + p.start() + +# Exit the completed processes +for p in processes: + p.join() + +# Get process results from the output queue +results = [output.get() for p in processes] + +print(results) diff --git a/h2inc b/h2inc new file mode 120000 index 0000000..775f62b --- /dev/null +++ b/h2inc @@ -0,0 +1 @@ +/data_2/Projects/h2inc/h2inc.py \ No newline at end of file diff --git a/h2inc.py b/h2inc.py old mode 100644 new mode 100755 index 1eff57e..1ac0511 --- a/h2inc.py +++ b/h2inc.py @@ -1,87 +1,112 @@ -# You are free to use and/or change this code for -# your own needs. - -# Original code (c)2018 Jan Lerking -# Program to convert C-header (*.h) files to nasm include files (*.inc), -# for direct usage in assembly programming using nasm/yasm. - -import os -import sys -from h2inc_parser import parseline, parseparsed -import h2inc_gui - -tupline = [] -preproc = () -filelist = [] -folderlist = [] -cnt = 0 - -def sourcedir_filecnt(sourcedir): - ### Return the number of files, ending with '.h', in sourcedir - including subdirectories ### - cnt = 0 - global filelist - for folderName, subfolders, files in os.walk(sourcedir): - for file in files: - if file.lower().endswith('.h'): - cnt += 1 - filelist += [folderName+'/'+file] - print(folderName+'/'+file) - #print(filelist) - return cnt - -def sourcedir_foldercnt(sourcedir): - ### Return the number of folders, if it contains '*.h' files, in sourcedir - including subdirectories ### - global cnt - global folderlist - for folderName, subfolders, files in os.walk(sourcedir): - if subfolders: - for subfolder in subfolders: - sourcedir_foldercnt(subfolder) - tempf = [file for file in files if file.lower().endswith('.h')] - if tempf: - cnt = cnt+1 - #print(folderName) - folderlist += [folderName] - #print(folderlist) - #print(len(folderlist)) - return cnt - -def process_files(sourcedir, destdir, filevar): - #global folderlist - global filelist - global preproc - outfile = '' - cnt = 0 - for f in filelist: - current_cnt = 0 - inputfile = f - filehandle = open(f, 'r') - current_cnt += 1 - filevar = current_cnt - print(os.path.basename(f)) - currentfile_update(os.path.basename(f)) - for lines in filehandle: - print(lines) - preproc = preproc+tuple([parseline(lines)]) - filehandle.close() - current_cnt += 1 - filevar = current_cnt - for elements in preproc: - outfile = outfile+parseparsed(elements) - outputfile = os.path.splitext(inputfile)[0]+'.inc' - outputfile = str(outputfile).replace(str(sourcedir.get()), str(destdir.get())) - current_cnt += 1 - filevar = current_cnt - print(outputfile) - if not os.path.exists(os.path.dirname(outputfile)): - try: - os.makedirs(os.path.dirname(outputfile)) - except OSError as exc: # Guard against race condition - if exc.errno != errno.EEXIST: - raise - newfile = open(outputfile, "w") - newfile.write(outfile) - newfile.close() - current_cnt += 1 - filevar = current_cnt - cnt += 1 +#!/usr/bin/env python3.5 + +# You are free to use and/or change this code for +# your own needs. + +# Original code (c)2018 Jan Lerking +# Program to convert C-header (*.h) files to nasm include files (*.inc), +# for direct usage in assembly programming using nasm/yasm. + +import os +import sys +import multiprocessing as mp +import io +from h2inc_parser import parseline, parseparsed +import h2inc_gui + +tupline = [] +preproc = () +filelist = [] +folderlist = [] +cnt = 0 +sourcedir = '' +destdir = '' +num_cores = mp.cpu_count() + +def sourcedir_filecnt(sourcedir): + ### Return the number of files, ending with '.h', in sourcedir - including subdirectories ### + cnt = 0 + global filelist + for folderName, subfolders, files in os.walk(sourcedir): + for file in files: + if file.lower().endswith('.h'): + cnt += 1 + filelist += [folderName+'/'+file] + print(folderName+'/'+file) + #print(filelist) + return cnt + +def sourcedir_foldercnt(sourcedir): + ### Return the number of folders, if it contains '*.h' files, in sourcedir - including subdirectories ### + global cnt + global folderlist + for folderName, subfolders, files in os.walk(sourcedir): + if subfolders: + for subfolder in subfolders: + sourcedir_foldercnt(subfolder) + tempf = [file for file in files if file.lower().endswith('.h')] + if tempf: + cnt = cnt+1 + #print(folderName) + folderlist += [folderName] + #print(folderlist) + #print(len(folderlist)) + return cnt + +def process_files(source, dest): + global sourcedir + global destdir + sourcedir = source + destdir = dest + pool = mp.Pool(processes=num_cores) + pool.map(process_file, filelist) + +def process_file(data): + outfile = '' + inputfile = data + encodings = ['utf-8', 'latin-1', 'windows-1250', 'windows-1252', 'ascii', + 'big5', 'big5hkscs', 'cp037', 'cp273', 'cp424', 'cp437', 'cp500', + 'cp720', 'cp737', 'cp775', 'cp850', 'cp852', 'cp855', 'cp856', + 'cp857', 'cp858', 'cp860', 'cp861', 'cp862', 'cp863', 'cp864', 'cp865', + 'cp866', 'cp869', 'cp874', 'cp875', 'cp932', 'cp949', 'cp950', 'cp1006', + 'cp1026', 'cp1125', 'cp1140', 'cp1250', 'cp1251', 'cp1252', 'cp1253', 'cp1254', + 'cp1255', 'cp1256', 'cp1257', 'cp1258', 'cp65001', 'euc-jp', 'euc-jis-2004', + 'euc-jisx0213', 'euc-kr', 'gb2312', 'gbk', 'gb18030', 'hz', 'iso2022-jp', + 'iso2022-jp-1', 'iso2022-jp-2', 'iso2022-jp-2004', 'iso2022-jp-3', + 'iso2022-jp-ext', 'iso2022-kr', 'iso8859-2', 'iso8859-3', 'iso8859-4', + 'iso8859-5', 'iso8859-6', 'iso8859-7', 'iso8859-8', 'iso8859-9', 'iso8859-10', + 'iso8859-11', 'iso8859-13', 'iso8859-14', 'iso8859-15', 'iso8859-16', 'johab', + 'koi8-r', 'koi8-t', 'koi8-u', 'kz1048', 'mac-cyrillic', 'mac-greek', + 'mac-iceland', 'mac-latin2', 'mac-roman', 'mac-turkish', 'ptcp154', + 'shift-jis', 'shift-jis-2004', 'shift-jisx0213', 'utf-32', 'utf-32-be', + 'utf-32-le', 'utf-16', 'utf-16-be', 'utf-16-le', 'utf-7', 'utf-8-sig'] + for e in encodings: + try: + fh = io.open(data, 'r', encoding=e) + fh.readlines() + fh.seek(0) + except UnicodeDecodeError: + print('got unicode error with %s , trying different encoding' % e) + else: + #print('opening the file with encoding: %s ' % e) + break + #print(os.path.basename(data)) + for lines in fh: + outfile = outfile+lines + fh.close() + outputfile = os.path.splitext(inputfile)[0]+'.inc' + outputfile = str(outputfile).replace(sourcedir, destdir) + #print(outputfile) + if not os.path.exists(os.path.dirname(outputfile)): + try: + os.makedirs(os.path.dirname(outputfile)) + except OSError as exc: # Guard against race condition + if exc.errno != errno.EEXIST: + raise + newfile = open(outputfile, "w") + newfile.write(outfile) + newfile.close() + +def async_process(num): + pool = mp.Pool(processes=num) + pool.map(process_file, filelist) \ No newline at end of file diff --git a/h2inc_gui.py b/h2inc_gui.py index b406bc3..9f40709 100644 --- a/h2inc_gui.py +++ b/h2inc_gui.py @@ -142,6 +142,7 @@ class h2incGUI: def translate(self, destdir, sourcedir, addinc): doinc = addinc.get() dest = destdir.get() + source = sourcedir.get() if doinc == 'yes': dest = dest+'/include' print(os.path.exists(os.path.dirname(dest))) @@ -153,7 +154,7 @@ class h2incGUI: raise destdir.set(dest) print ('Destination directory: ', destdir.get()) - process_files(sourcedir, destdir, self.cfilevar) + process_files(source, dest) def cfileprogress_update(cnt): self.cfilevar = cnt diff --git a/multiprocessing b/multiprocessing new file mode 120000 index 0000000..2a5eb46 --- /dev/null +++ b/multiprocessing @@ -0,0 +1 @@ +/data_2/Projects/h2inc/multiprocessing_test.py \ No newline at end of file diff --git a/pool_test.py b/pool_test.py new file mode 100644 index 0000000..d7db443 --- /dev/null +++ b/pool_test.py @@ -0,0 +1,20 @@ +from multiprocessing import Pool + +import time + +work = (["A", 5], ["B", 2], ["C", 1], ["D", 3]) + + +def work_log(work_data): + print(" Process %s waiting %s seconds" % (work_data[0], work_data[1])) + time.sleep(int(work_data[1])) + print(" Process %s Finished." % work_data[0]) + + +def pool_handler(): + p = Pool(2) + p.map(work_log, work) + + +if __name__ == '__main__': + pool_handler() \ No newline at end of file