summaryrefslogtreecommitdiff
path: root/solenv/bin
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-06-16 05:01:45 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-06-18 10:06:51 +0200
commit66a0713dc9c676182fcd7aa1e21f8dc25c05be5e (patch)
tree3e4fd4107c94aa148b1ca0e0edccfe64f80062f7 /solenv/bin
parent88085a5b79eb7e11c0609b832c316b63146f4976 (diff)
handle missing dep files in concat-deps
* this and Ib4762f5a260035f00b5e68cf45b687fdf02e9c02 reduces a default build on my machine from 2min25sec to 2min12sec * without unitchecks, its down to 1min50sec now * it reduces the build time on a i7-4770 Windows tinderbox from 99min to 89min * by now it also takes care of avoiding most string copying, although this can certainly be considered overeager given that the file creation on Windows took ~250ms per file before and still will take a lot longer than any string operation with this change Change-Id: I515432bdefe2b055c78b6ba97868adbde65d9165
Diffstat (limited to 'solenv/bin')
-rw-r--r--solenv/bin/concat-deps.c115
1 files changed, 115 insertions, 0 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 36139466a225..c60beeb5babd 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -118,6 +118,7 @@
int internal_boost = 0;
static char* base_dir;
static char* work_dir;
+int work_dir_len;
#ifdef __GNUC__
#define clz __builtin_clz
@@ -864,6 +865,44 @@ static inline char * eat_space_at_end(char * end)
return real_end;
}
+static char* phony_content_buffer;
+static inline char* generate_phony_line(char* phony_target, char* extension)
+{
+char* src;
+char* dest;
+char* last_dot;
+ //fprintf(stderr, "generate_phony_line called with phony_target %s and extension %s\n", phony_target, extension);
+ for(dest = phony_content_buffer+work_dir_len, src = phony_target; *src != 0; ++src, ++dest)
+ {
+ *dest = *src;
+ if(*dest == '.')
+ {
+ last_dot = dest;
+ }
+ }
+ //fprintf(stderr, "generate_phony_line after phony_target copy: %s\n", phony_content_buffer);
+ for(dest = last_dot+1, src = extension; *src != 0; ++src, ++dest)
+ {
+ *dest = *src;
+ }
+ //fprintf(stderr, "generate_phony_line after extension add: %s\n", phony_content_buffer);
+ strcpy(dest, ": $(gb_Helper_PHONY)\n");
+ //fprintf(stderr, "generate_phony_line after phony add: %s\n", phony_content_buffer);
+ return phony_content_buffer;
+}
+
+static inline int generate_phony_file(char* fn, char* content)
+{
+FILE* depfile;
+ depfile = fopen(fn, "w");
+ if(depfile)
+ {
+ fputs(content, depfile);
+ fclose(depfile);
+ }
+ return !depfile;
+}
+
static int _process(struct hash* dep_hash, char* fn)
{
int rc;
@@ -872,6 +911,8 @@ char* end;
char* cursor;
char* cursor_out;
char* base;
+char* created_line;
+char* src_relative;
int continuation = 0;
char last_ns = 0;
off_t size;
@@ -985,6 +1026,75 @@ off_t size;
}
}
}
+ else
+ {
+ if(strncmp(fn, work_dir, work_dir_len) == 0)
+ {
+ if(strncmp(fn+work_dir_len, "/Dep/", 5) == 0)
+ {
+ src_relative = fn+work_dir_len+5;
+ // cases ordered by frequency
+ if(strncmp(src_relative, "CxxObject/", 10) == 0)
+ {
+ created_line = generate_phony_line(src_relative+10, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(fn+work_dir_len+5, "UnoApiPartTarget/", 17) == 0)
+ {
+ created_line = generate_phony_line(src_relative+17, "urd");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(fn+work_dir_len+5, "SrsPartTarget/", 14) == 0)
+ {
+ created_line = generate_phony_line(src_relative+14, "");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(src_relative, "GenCxxObject/", 13) == 0)
+ {
+ created_line = generate_phony_line(src_relative+13, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(src_relative, "CObject/", 8) == 0)
+ {
+ created_line = generate_phony_line(src_relative+8, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(src_relative, "GenCObject/", 11) == 0)
+ {
+ created_line = generate_phony_line(src_relative+11, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(src_relative, "SdiObject/", 10) == 0)
+ {
+ created_line = generate_phony_line(src_relative+10, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(src_relative, "AsmObject/", 10) == 0)
+ {
+ created_line = generate_phony_line(src_relative+10, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(src_relative, "ObjCxxObject/", 13) == 0)
+ {
+ created_line = generate_phony_line(src_relative+13, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else if(strncmp(src_relative, "ObjCObject/", 11) == 0)
+ {
+ created_line = generate_phony_line(src_relative+11, "o");
+ rc = generate_phony_file(fn, created_line);
+ }
+ else
+ {
+ fprintf(stderr, "no magic for %s(%s) in %s\n", fn, src_relative, work_dir);
+ }
+ }
+ if(!rc)
+ {
+ puts(created_line);
+ }
+ }
+ }
return rc;
}
@@ -994,6 +1104,7 @@ static void _usage(void)
}
#define kDEFAULT_HASH_SIZE 4096
+#define PHONY_TARGET_BUFFER 4096
static int get_var(char **var, const char *name)
{
@@ -1023,6 +1134,10 @@ const char *env_str;
}
if(get_var(&base_dir, "SRCDIR") || get_var(&work_dir, "WORKDIR"))
return 1;
+ work_dir_len = strlen(work_dir);
+ phony_content_buffer = malloc(PHONY_TARGET_BUFFER);
+ strcpy(phony_content_buffer, work_dir);
+ phony_content_buffer[work_dir_len] = '/';
env_str = getenv("SYSTEM_BOOST");
internal_boost = !env_str || strcmp(env_str,"TRUE");