RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-01-11 15:49:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #130 from jpoimboe/cdo-log-obj-name

Browse Source 
create-diff-object logging improvements
This commit is contained in:
Seth Jennings 2014-04-17 14:41:59 -05:00
commit 4fb8d76eb3
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kpatch-build/create-diff-object.c
View File

@ -2,7 +2,7 @@
* create-diff-object.c * create-diff-object.c
* *
* Copyright (C) 2014 Seth Jennings <sjenning@redhat.com> * Copyright (C) 2014 Seth Jennings <sjenning@redhat.com>
* Copyright (C) 2013 Josh Poimboeuf <jpoimboe@redhat.com> * Copyright (C) 2013-2014 Josh Poimboeuf <jpoimboe@redhat.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -43,18 +43,19 @@
#include <error.h> #include <error.h>
#include <gelf.h> #include <gelf.h>
#include <argp.h> #include <argp.h>
#include <libgen.h>
#define ERROR(format, ...) \ #define ERROR(format, ...) \
error(1, 0, "%s: %d: " format, __FUNCTION__, __LINE__, ##__VA_ARGS__) error(1, 0, "%s: %d: " format, __FUNCTION__, __LINE__, ##__VA_ARGS__)
#define DIFF_FATAL(format, ...) \ #define DIFF_FATAL(format, ...) \
({ \ ({ \
printf("%s:%d: " format "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); \ printf("%s: " format "\n", objname, ##__VA_ARGS__); \
error(2, 0, "unreconcilable difference"); \ error(2, 0, "unreconcilable difference"); \
}) })
#define log_debug(format, ...) log(DEBUG, format, ##__VA_ARGS__) #define log_debug(format, ...) log(DEBUG, format, ##__VA_ARGS__)
#define log_normal(format, ...) log(NORMAL, format, ##__VA_ARGS__) #define log_normal(format, ...) log(NORMAL, "%s: " format, objname, ##__VA_ARGS__)
#define log(level, format, ...) \ #define log(level, format, ...) \
({ \ ({ \
@ -62,6 +63,7 @@
printf(format, ##__VA_ARGS__); \ printf(format, ##__VA_ARGS__); \
}) })
char *objname;
enum loglevel { enum loglevel {
DEBUG, DEBUG,
@ -736,26 +738,6 @@ void kpatch_verify_patchability(struct kpatch_elf *kelf)
DIFF_FATAL("changed section %s not selected for inclusion", sec->name); DIFF_FATAL("changed section %s not selected for inclusion", sec->name);
} }
int kpatch_find_changed_functions(struct kpatch_elf *kelf)
{
struct symbol *sym;
int i, changed = 0;
for_each_symbol(i, sym, &kelf->symbols) {
if (sym->type != STT_FUNC)
continue;
if (sym->status == CHANGED) {
changed = 1;
printf("function %s has changed\n",sym->name);
}
}
if (!changed)
printf("no changes found\n");
return changed;
}
#define inc_printf(fmt, ...) \ #define inc_printf(fmt, ...) \
log_debug("%*s" fmt, recurselevel, "", ##__VA_ARGS__); log_debug("%*s" fmt, recurselevel, "", ##__VA_ARGS__);
@ -1309,6 +1291,8 @@ int main(int argc, char *argv[])
elf_version(EV_CURRENT); elf_version(EV_CURRENT);
objname = basename(arguments.args[0]);
kelf_base = kpatch_elf_open(arguments.args[0]); kelf_base = kpatch_elf_open(arguments.args[0]);
kelf_patched = kpatch_elf_open(arguments.args[1]); kelf_patched = kpatch_elf_open(arguments.args[1]);
outfile = arguments.args[2]; outfile = arguments.args[2];