diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/bootchart-0.9.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/bootchart-0.9.2-r1.ebuild deleted file mode 100644 index b6777ddace..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/bootchart-0.9.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# NOTE: This is based on the bootchart found in Ubuntu, which is a re-working -# of the bootchart project to use a C-based collector daemon. There wasn't a -# good link to a source tarball to use in the ebuild and all we need are the -# collector and gather files from it so they are inlined in the FILESDIR. - -inherit toolchain-funcs - -DESCRIPTION="Performance analysis and visualization of the system boot process" -HOMEPAGE="http://packages.ubuntu.com/lucid/bootchart" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_unpack() { - mkdir "${S}" - cp "${FILESDIR}/bootchart-collector.c" "${S}/collector.c" - cp "${FILESDIR}/bootchart-gather.sh" "${S}/gather" - cp "${FILESDIR}/bootchart.conf" "${S}" -} - -src_compile() { - $(tc-getCC) ${CFLAGS} -o collector collector.c || - die "Unable to compile bootchart collector." -} - -src_install() { - exeinto /lib/bootchart - doexe collector gather - - insinto /etc/init - doins bootchart.conf -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-collector.c b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-collector.c deleted file mode 100644 index c40cebb3bf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-collector.c +++ /dev/null @@ -1,438 +0,0 @@ -/* bootchart-collector - * - * Copyright © 2009 Canonical Ltd. - * Author: Scott James Remnant . - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#define BUFSIZE 524288 - - -int append_buf (const char *str, size_t len, - int outfd, char *outbuf, size_t *outlen); -int copy_buf (int fd, int outfd, char *outbuf, size_t *outlen); -int flush_buf (int outfd, char *outbuf, size_t *outlen); - -int read_file (int fd, const char *uptime, size_t uptimelen, - int outfd, char *outbuf, size_t *outlen); -int read_proc (DIR *proc, const char *uptime, size_t uptimelen, - int outfd, char *outbuf, size_t *outlen); - -unsigned long get_uptime (int fd); -void sig_handler (int signum); - - -int -append_buf (const char *str, - size_t len, - int outfd, - char *outbuf, - size_t *outlen) -{ - assert (len <= BUFSIZE); - - if (*outlen + len > BUFSIZE) - if (flush_buf (outfd, outbuf, outlen) < 0) - return -1; - - memcpy (outbuf + *outlen, str, len); - *outlen += len; - - return 0; -} - -int -copy_buf (int fd, - int outfd, - char *outbuf, - size_t *outlen) -{ - for (;;) { - ssize_t len; - - if (*outlen == BUFSIZE) - if (flush_buf (outfd, outbuf, outlen) < 0) - return -1; - - len = read (fd, outbuf + *outlen, BUFSIZE - *outlen); - if (len < 0) { - perror ("read"); - return -1; - } else if (len == 0) - break; - - *outlen += len; - } - - return 0; -} - -int -flush_buf (int outfd, - char *outbuf, - size_t *outlen) -{ - size_t writelen = 0; - - while (writelen < *outlen) { - ssize_t len; - - len = write (outfd, outbuf + writelen, *outlen - writelen); - if (len < 0) { - perror ("write"); - exit (1); - } - - writelen += len; - } - - *outlen = 0; - - return 0; -} - - -int -read_file (int fd, - const char *uptime, - size_t uptimelen, - int outfd, - char *outbuf, - size_t *outlen) -{ - lseek (fd, SEEK_SET, 0); - - if (append_buf (uptime, uptimelen, outfd, outbuf, outlen) < 0) - return -1; - - if (copy_buf (fd, outfd, outbuf, outlen) < 0) - return -1; - - if (append_buf ("\n", 1, outfd, outbuf, outlen) < 0) - return -1; - - return 0; -} - -int -read_proc (DIR *proc, - const char *uptime, - size_t uptimelen, - int outfd, - char *outbuf, - size_t *outlen) -{ - struct dirent *ent; - - rewinddir (proc); - - if (append_buf (uptime, uptimelen, outfd, outbuf, outlen) < 0) - return -1; - - while ((ent = readdir (proc)) != NULL) { - char filename[PATH_MAX]; - int fd; - - if ((ent->d_name[0] < '0') || (ent->d_name[0] > '9')) - continue; - - sprintf (filename, "/proc/%s/stat", ent->d_name); - - fd = open (filename, O_RDONLY); - if (fd < 0) - continue; - - if (copy_buf (fd, outfd, outbuf, outlen) < 0) - ; - - if (close (fd) < 0) - continue; - } - - if (append_buf ("\n", 1, outfd, outbuf, outlen) < 0) - return -1; - - return 0; -} - - -unsigned long -get_uptime (int fd) -{ - char buf[80]; - ssize_t len; - unsigned long u1, u2; - - lseek (fd, SEEK_SET, 0); - - len = read (fd, buf, sizeof buf); - if (len < 0) { - perror ("read"); - return 0; - } - - buf[len] = '\0'; - - if (sscanf (buf, "%lu.%lu", &u1, &u2) != 2) { - perror ("sscanf"); - return 0; - } - - return u1 * 100 + u2; -} - - -void -sig_handler (int signum) -{ -} - -int -main (int argc, - char *argv[]) -{ - struct sigaction act; - sigset_t mask, oldmask; - struct rlimit rlim; - struct timespec timeout; - const char *output_dir = "."; - char filename[PATH_MAX]; - int sfd, dfd, ufd; - DIR *proc; - int statfd, diskfd, procfd; - char statbuf[BUFSIZE], diskbuf[BUFSIZE], procbuf[BUFSIZE]; - size_t statlen = 0, disklen = 0, proclen = 0; - unsigned long reltime = 0; - int arg = 1, rel = 0; - - if ((argc > arg) && (! strcmp (argv[arg], "-r"))) { - rel = 1; - arg++; - } - - if (argc <= arg) { - fprintf (stderr, "Usage: %s [-r] HZ [DIR]\n", argv[0]); - exit (1); - } - - if (argc > arg) { - unsigned long hz; - char *endptr; - - hz = strtoul (argv[arg], &endptr, 10); - if (*endptr) { - fprintf (stderr, "%s: HZ not an integer\n", argv[0]); - exit (1); - } - - if (hz > 1) { - timeout.tv_sec = 0; - timeout.tv_nsec = 1000000000 / hz; - } else { - timeout.tv_sec = 1; - timeout.tv_nsec = 0; - } - - arg++; - } - - if (argc > arg) { - output_dir = argv[arg]; - arg++; - } - - - sigemptyset (&mask); - sigaddset (&mask, SIGTERM); - sigaddset (&mask, SIGINT); - - if (sigprocmask (SIG_BLOCK, &mask, &oldmask) < 0) { - perror ("sigprocmask"); - exit (1); - } - - act.sa_handler = sig_handler; - act.sa_flags = 0; - sigemptyset (&act.sa_mask); - - if (sigaction (SIGTERM, &act, NULL) < 0) { - perror ("sigaction SIGTERM"); - exit (1); - } - - if (sigaction (SIGINT, &act, NULL) < 0) { - perror ("sigaction SIGINT"); - exit (1); - } - - /* Drop cores if we go wrong */ - if (chdir ("/")) - ; - - rlim.rlim_cur = RLIM_INFINITY; - rlim.rlim_max = RLIM_INFINITY; - - setrlimit (RLIMIT_CORE, &rlim); - - - proc = opendir ("/proc"); - if (! proc) { - perror ("opendir /proc"); - exit (1); - } - - sfd = open ("/proc/stat", O_RDONLY); - if (sfd < 0) { - perror ("open /proc/stat"); - exit (1); - } - - dfd = open ("/proc/diskstats", O_RDONLY); - if (dfd < 0) { - perror ("open /proc/diskstats"); - exit (1); - } - - ufd = open ("/proc/uptime", O_RDONLY); - if (ufd < 0) { - perror ("open /proc/uptime"); - exit (1); - } - - - sprintf (filename, "%s/proc_stat.log", output_dir); - statfd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0644); - if (statfd < 0) { - perror ("open proc_stat.log"); - exit (1); - } - - sprintf (filename, "%s/proc_diskstats.log", output_dir); - diskfd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0644); - if (diskfd < 0) { - perror ("open proc_diskstats.log"); - exit (1); - } - - sprintf (filename, "%s/proc_ps.log", output_dir); - procfd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0644); - if (procfd < 0) { - perror ("open proc_ps.log"); - exit (1); - } - - - if (rel) { - reltime = get_uptime (ufd); - if (! reltime) - exit (1); - } - - for (;;) { - char uptime[80]; - size_t uptimelen; - unsigned long u; - - u = get_uptime (ufd); - if (! u) - exit (1); - - uptimelen = sprintf (uptime, "%lu\n", u - reltime); - - - if (read_file (sfd, uptime, uptimelen, - statfd, statbuf, &statlen) < 0) - exit (1); - - if (read_file (dfd, uptime, uptimelen, - diskfd, diskbuf, &disklen) < 0) - exit (1); - - if (read_proc (proc, uptime, uptimelen, - procfd, procbuf, &proclen) < 0) - exit (1); - - if (pselect (0, NULL, NULL, NULL, &timeout, &oldmask) < 0) { - if (errno == EINTR) { - break; - } else { - perror ("pselect"); - exit (1); - } - } - } - - - if (flush_buf (statfd, statbuf, &statlen) < 0) - exit (1); - if (close (statfd) < 0) { - perror ("close proc_stat.log"); - exit (1); - } - - if (flush_buf (diskfd, diskbuf, &disklen) < 0) - exit (1); - if (close (diskfd) < 0) { - perror ("close proc_diskstats.log"); - exit (1); - } - - if (flush_buf (procfd, procbuf, &proclen) < 0) - exit (1); - if (close (procfd) < 0) { - perror ("close proc_ps.log"); - exit (1); - } - - - if (close (ufd) < 0) { - perror ("close /proc/uptime"); - exit (1); - } - - if (close (dfd) < 0) { - perror ("close /proc/diskstats"); - exit (1); - } - - if (close (sfd) < 0) { - perror ("close /proc/stat"); - exit (1); - } - - if (closedir (proc) < 0) { - perror ("close /proc"); - exit (1); - } - - return 0; -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-gather.sh b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-gather.sh deleted file mode 100644 index 9a7c6ccae9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart-gather.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -e -# bootchart-gather -# -# Copyright © 2009 Canonical Ltd. -# Author: Scott James Remnant . -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Gather output of the bootchart collector into a tarball that bootchart -# can process itself. -TARBALL="$1" -if [ -z "$TARBALL" ]; then - echo "Usage: $0 TARBALL [DIR]" 1>&2 - exit 1 -fi - -if [ "${TARBALL#/}" = "$TARBALL" ]; then - TARBALL="$(pwd)/$TARBALL" -fi - -DIR="$2" -[ -n "$DIR" ] || DIR="." - - -cd $DIR - -# Output the header file with information about the system -{ - echo "version = $(dpkg-query -f'${Version}' -W bootchart)" - echo "title = Boot chart for $(hostname) ($(date))" - echo "system.uname = $(uname -srvm)" - echo "system.release = $(lsb_release -sd)" - case `uname -m` in - arm*) - echo -n "system.cpu = $(grep '^Processor' /proc/cpuinfo)" - if [ `grep -c '^processor' /proc/cpuinfo` -gt 0 ]; then - echo " ($(grep -c '^processor' /proc/cpuinfo))" - else - echo " (1)" - fi - ;; - *) - echo "system.cpu = $(grep '^model name' /proc/cpuinfo)"\ - "($(grep -c '^model name' /proc/cpuinfo))" - ;; - esac - echo "system.kernel.options = $(sed q /proc/cmdline)" -} > header - -# Create a tarball of the logs and header which can be parsed into the chart -tar czf $TARBALL header proc_stat.log proc_diskstats.log proc_ps.log - -exit 0 diff --git a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart.conf b/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart.conf deleted file mode 100644 index 3e34ebcae7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-benchmarks/bootchart/files/bootchart.conf +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description "Collects boot data and optionally creates a chart" -author "chromium-os-dev@chromium.org" - -start on startup -stop on started system-services - -env BC_RUN=/dev/.bootchart -env BC_LOG=/var/log/bootchart - -pre-start exec mkdir -p "$BC_RUN" - -exec /lib/bootchart/collector 25 "$BC_RUN" - -pre-stop exec sleep 10 - -post-stop script - BC_DATA="${BC_LOG}/boot-$(date +%Y%m%d-%H%M%S).tgz" - - mkdir -p "$BC_LOG" - /lib/bootchart/gather "$BC_DATA" "$BC_RUN" - - rm -rf "$BC_RUN" -end script diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index ecbfa135aa..c8f219f5da 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="http://coreos.com" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm x86" -IUSE="bootimage coreboot cros_ec bootchart" +IUSE="bootimage coreboot cros_ec" ################################################################################ @@ -109,9 +109,6 @@ RDEPEND="${RDEPEND} app-arch/gzip app-arch/sharutils app-arch/tar - bootchart? ( - app-benchmarks/bootchart - ) app-shells/bash app-shells/dash coreos-base/chromeos-auth-config