Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28171447 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "cutils: trace 64-bit compile issues"

parents 60357975 a459d0b0

include/cutils/trace.h

+10 −9
Original line number Original line Diff line number Diff line
@@ -17,13 +17,14 @@ 
#ifndef _LIBS_CUTILS_TRACE_H

#ifndef _LIBS_CUTILS_TRACE_H

#define _LIBS_CUTILS_TRACE_H

#define _LIBS_CUTILS_TRACE_H





#include <inttypes.h>

#include <stdbool.h>

#include <stdint.h>

#include <sys/cdefs.h>

#include <sys/cdefs.h>

#include <sys/types.h>

#include <sys/types.h>

#include <stdint.h>

#include <stdbool.h>

#include <unistd.h>

#include <unistd.h>

#include <cutils/compiler.h>





#include <cutils/compiler.h>

#ifdef ANDROID_SMP

#ifdef ANDROID_SMP

#include <cutils/atomic-inline.h>

#include <cutils/atomic-inline.h>

#else

#else
@@ -217,8 +218,8 @@ static inline void atrace_async_begin(uint64_t tag, const char* name, 
        char buf[ATRACE_MESSAGE_LENGTH];

        char buf[ATRACE_MESSAGE_LENGTH];

        size_t len;

        size_t len;





        len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "S|%d|%s|%d", getpid(),

        len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "S|%d|%s|%" PRId32,

                name, cookie);

                getpid(), name, cookie);

        write(atrace_marker_fd, buf, len);

        write(atrace_marker_fd, buf, len);

    }

    }

}

}
@@ -235,8 +236,8 @@ static inline void atrace_async_end(uint64_t tag, const char* name, 
        char buf[ATRACE_MESSAGE_LENGTH];

        char buf[ATRACE_MESSAGE_LENGTH];

        size_t len;

        size_t len;





        len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "F|%d|%s|%d", getpid(),

        len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "F|%d|%s|%" PRId32,

                name, cookie);

                getpid(), name, cookie);

        write(atrace_marker_fd, buf, len);

        write(atrace_marker_fd, buf, len);

    }

    }

}

}
@@ -253,7 +254,7 @@ static inline void atrace_int(uint64_t tag, const char* name, int32_t value) 
        char buf[ATRACE_MESSAGE_LENGTH];

        char buf[ATRACE_MESSAGE_LENGTH];

        size_t len;

        size_t len;





        len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "C|%d|%s|%d",

        len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "C|%d|%s|%" PRId32,

                getpid(), name, value);

                getpid(), name, value);

        write(atrace_marker_fd, buf, len);

        write(atrace_marker_fd, buf, len);

    }

    }
@@ -270,7 +271,7 @@ static inline void atrace_int64(uint64_t tag, const char* name, int64_t value) 
        char buf[ATRACE_MESSAGE_LENGTH];

        char buf[ATRACE_MESSAGE_LENGTH];

        size_t len;

        size_t len;





        len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "C|%d|%s|%lld",

        len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "C|%d|%s|%" PRId64,

                getpid(), name, value);

                getpid(), name, value);

        write(atrace_marker_fd, buf, len);

        write(atrace_marker_fd, buf, len);

    }

    }