Not surprisingly, this needs a rebase:
bill@Ubuntu15:~/linaro/ivan2$ git am --reject ~/Mail/Incoming/Ivan/1
Applying: linux-generic: cpumask_task: use cpumask got at init
Checking patch platform/linux-generic/include/odp_internal.h...
error: while searching for:
#include <odp/init.h>
#include <odp/thread.h>
extern __thread int __odp_errno;
error: patch failed: platform/linux-generic/include/odp_internal.h:20
error: while searching for:
int cache_line_size;
int cpu_count;
char model_str[128];
} odp_system_info_t;
struct odp_global_data_s {
error: patch failed: platform/linux-generic/include/odp_internal.h:30
Hunk #3 succeeded at 78 (offset 15 lines).
Checking patch platform/linux-generic/odp_cpumask_task.c...
error: while searching for:
#include <pthread.h>
#include <odp/cpumask.h>
#include <odp_debug_internal.h>
int odp_cpumask_default_worker(odp_cpumask_t *mask, int num)
{
int ret, cpu, i;
cpu_set_t cpuset;
ret = pthread_getaffinity_np(pthread_self(),
sizeof(cpu_set_t), &cpuset);
if (ret != 0)
ODP_ABORT("failed to read CPU affinity value\n");
odp_cpumask_zero(mask);
/*
* If no user supplied number or it's too large, then attempt
error: patch failed: platform/linux-generic/odp_cpumask_task.c:10
Checking patch platform/linux-generic/odp_system_info.c...
error: while searching for:
#include <sys/types.h>
#include <dirent.h>
typedef struct {
const char *cpu_arch_str;
int (*cpuinfo_parser)(FILE *file, odp_system_info_t *sysinfo);
error: patch failed: platform/linux-generic/odp_system_info.c:24
error: while searching for:
/*
* Report the number of CPUs in the affinity mask of the main thread
*/
static int sysconf_cpu_count(void)
{
cpu_set_t cpuset;
int ret;
ret = pthread_getaffinity_np(pthread_self(),
sizeof(cpuset), &cpuset);
if (ret != 0)
return 0;
return CPU_COUNT(&cpuset);
}
#if defined __x86_64__ || defined __i386__ || defined __OCTEON__ || \
error: patch failed: platform/linux-generic/odp_system_info.c:41
Hunk #3 succeeded at 115 (offset -168 lines).
error: while searching for:
{
int ret;
ret = sysconf_cpu_count();
if (ret == 0) {
ODP_ERR("sysconf_cpu_count failed.\n");
return -1;
error: patch failed: platform/linux-generic/odp_system_info.c:320
Hunk #5 succeeded at 172 (offset -199 lines).
Applying patch platform/linux-generic/include/odp_internal.h with 2
rejects...
Rejected hunk #1.
Rejected hunk #2.
Hunk #3 applied cleanly.
Applying patch platform/linux-generic/odp_cpumask_task.c with 1 reject...
Rejected hunk #1.
Applying patch platform/linux-generic/odp_system_info.c with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Patch failed at 0001 linux-generic: cpumask_task: use cpumask got at init
The copy of the patch that failed is found in:
/home/bill/linaro/ivan2/.git/rebase-apply/patch
On Wed, Apr 27, 2016 at 1:03 PM, Maxim Uvarov <maxim.uva...@linaro.org>
wrote:
> Looks like we still need to review these 2 patches.
>
> Maxim.
>
> On 01/23/16 01:24, Ivan Khoronzhuk wrote:
>
>> This patch series is intended to run control thread on CPU0.
>> It's increases worker thread CPU independence and allow to use
>> local time API on main thread in correct way.
>>
>> Ivan Khoronzhuk (2):
>> linux-generic: cpumask_task: use cpumask got at init
>> linux-generic: init: assign affinity for main thread
>>
>> platform/linux-generic/include/odp_internal.h | 3 ++
>> platform/linux-generic/odp_cpumask_task.c | 9 ++---
>> platform/linux-generic/odp_init.c | 50
>> ++++++++++++++++++++-------
>> platform/linux-generic/odp_system_info.c | 22 +++++++-----
>> 4 files changed, 57 insertions(+), 27 deletions(-)
>>
>>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
>
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
