app: merge with internal log package to remove the separate log.appID

Signed-off-by: Elias Naur <mail@eliasnaur.com>

app/internal/log/log.go

@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: Unlicense OR MIT
-
-// Package points standard output, standard error and the standard
-// library package log to the platform logger.
-package log
-
-var appID = "gio"

app/internal/log/log_android.go

@@ -1,87 +0,0 @@
-// SPDX-License-Identifier: Unlicense OR MIT
-
-package log
-
-/*
-#cgo LDFLAGS: -llog
-
-#include <stdlib.h>
-#include <android/log.h>
-*/
-import "C"
-
-import (
-	"bufio"
-	"log"
-	"os"
-	"runtime"
-	"syscall"
-	"unsafe"
-)
-
-// 1024 is the truncation limit from android/log.h, plus a \n.
-const logLineLimit = 1024
-
-var logTag = C.CString(appID)
-
-func init() {
-	// Android's logcat already includes timestamps.
-	log.SetFlags(log.Flags() &^ log.LstdFlags)
-	log.SetOutput(new(androidLogWriter))
-
-	// Redirect stdout and stderr to the Android logger.
-	logFd(os.Stdout.Fd())
-	logFd(os.Stderr.Fd())
-}
-
-type androidLogWriter struct {
-	// buf has room for the maximum log line, plus a terminating '\0'.
-	buf [logLineLimit + 1]byte
-}
-
-func (w *androidLogWriter) Write(data []byte) (int, error) {
-	n := 0
-	for len(data) > 0 {
-		msg := data
-		// Truncate the buffer, leaving space for the '\0'.
-		if max := len(w.buf) - 1; len(msg) > max {
-			msg = msg[:max]
-		}
-		buf := w.buf[:len(msg)+1]
-		copy(buf, msg)
-		// Terminating '\0'.
-		buf[len(msg)] = 0
-		C.__android_log_write(C.ANDROID_LOG_INFO, logTag, (*C.char)(unsafe.Pointer(&buf[0])))
-		n += len(msg)
-		data = data[len(msg):]
-	}
-	return n, nil
-}
-
-func logFd(fd uintptr) {
-	r, w, err := os.Pipe()
-	if err != nil {
-		panic(err)
-	}
-	if err := syscall.Dup3(int(w.Fd()), int(fd), syscall.O_CLOEXEC); err != nil {
-		panic(err)
-	}
-	go func() {
-		lineBuf := bufio.NewReaderSize(r, logLineLimit)
-		// The buffer to pass to C, including the terminating '\0'.
-		buf := make([]byte, lineBuf.Size()+1)
-		cbuf := (*C.char)(unsafe.Pointer(&buf[0]))
-		for {
-			line, _, err := lineBuf.ReadLine()
-			if err != nil {
-				break
-			}
-			copy(buf, line)
-			buf[len(line)] = 0
-			C.__android_log_write(C.ANDROID_LOG_INFO, logTag, cbuf)
-		}
-		// The garbage collector doesn't know that w's fd was dup'ed.
-		// Avoid finalizing w, and thereby avoid its finalizer closing its fd.
-		runtime.KeepAlive(w)
-	}()
-}

app/internal/log/log_ios.go

@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: Unlicense OR MIT
-
-//go:build darwin && ios
-// +build darwin,ios
-
-package log
-
-/*
-#cgo CFLAGS: -Werror -fmodules -fobjc-arc -x objective-c
-
-@import Foundation;
-
-static void nslog(char *str) {
-	NSLog(@"%@", @(str));
-}
-*/
-import "C"
-
-import (
-	"bufio"
-	"io"
-	"log"
-	"unsafe"
-
-	_ "gioui.org/internal/cocoainit"
-)
-
-func init() {
-	// macOS Console already includes timestamps.
-	log.SetFlags(log.Flags() &^ log.LstdFlags)
-	log.SetOutput(newNSLogWriter())
-}
-
-func newNSLogWriter() io.Writer {
-	r, w := io.Pipe()
-	go func() {
-		// 1024 is an arbitrary truncation limit, taken from Android's
-		// log buffer size.
-		lineBuf := bufio.NewReaderSize(r, 1024)
-		// The buffer to pass to C, including the terminating '\0'.
-		buf := make([]byte, lineBuf.Size()+1)
-		cbuf := (*C.char)(unsafe.Pointer(&buf[0]))
-		for {
-			line, _, err := lineBuf.ReadLine()
-			if err != nil {
-				break
-			}
-			copy(buf, line)
-			buf[len(line)] = 0
-			C.nslog(cbuf)
-		}
-	}()
-	return w
-}

app/internal/log/log_windows.go

@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: Unlicense OR MIT
-
-package log
-
-import (
-	"log"
-	"syscall"
-	"unsafe"
-)
-
-type logger struct{}
-
-var (
-	kernel32           = syscall.NewLazyDLL("kernel32")
-	outputDebugStringW = kernel32.NewProc("OutputDebugStringW")
-	debugView          *logger
-)
-
-func init() {
-	// Windows DebugView already includes timestamps.
-	if syscall.Stderr == 0 {
-		log.SetFlags(log.Flags() &^ log.LstdFlags)
-		log.SetOutput(debugView)
-	}
-}
-
-func (l *logger) Write(buf []byte) (int, error) {
-	p, err := syscall.UTF16PtrFromString(string(buf))
-	if err != nil {
-		return 0, err
-	}
-	outputDebugStringW.Call(uintptr(unsafe.Pointer(p)))
-	return len(buf), nil
-}