From owner-p4-projects@FreeBSD.ORG Sun Jun 20 01:02:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD29F106566B; Sun, 20 Jun 2010 01:02:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1AEB1065676 for ; Sun, 20 Jun 2010 01:02:11 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E2C48FC13 for ; Sun, 20 Jun 2010 01:02:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5K12BgE023260 for ; Sun, 20 Jun 2010 01:02:11 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5K12B9L023258 for perforce@freebsd.org; Sun, 20 Jun 2010 01:02:11 GMT (envelope-from ivoras@FreeBSD.org) Date: Sun, 20 Jun 2010 01:02:11 GMT Message-Id: <201006200102.o5K12B9L023258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2010 01:02:12 -0000 http://p4web.freebsd.org/@@179932?ac=10 Change 179932 by ivoras@betelgeuse on 2010/06/20 01:01:40 Start parsing +CONTENTS Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#14 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#4 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#4 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#13 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#13 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#14 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#12 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#12 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#12 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#11 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#14 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#4 (text+ko) ==== @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -38,11 +39,11 @@ enum PPMETHOD { PPMETHOD_UNKNOWN, PPMETHOD_CP, PPMETHOD_BSDIFF }; -SLIST_HEAD(pplist_head, pplist); +STAILQ_HEAD(pplist_head, pplist); struct pplist { char filename[PATH_MAX]; enum PPMETHOD method; - SLIST_ENTRY(pplist) linkage; + STAILQ_ENTRY(pplist) linkage; }; @@ -70,10 +71,10 @@ if (fp == NULL) err(1, "Cannot open file: %s", filename); memset(pp, 0, sizeof(*pp)); - SLIST_INIT(&pp->pp_add); - SLIST_INIT(&pp->pp_remove); - SLIST_INIT(&pp->pp_rmdir); - SLIST_INIT(&pp->pp_patch); + STAILQ_INIT(&pp->pp_add); + STAILQ_INIT(&pp->pp_remove); + STAILQ_INIT(&pp->pp_rmdir); + STAILQ_INIT(&pp->pp_patch); while (fgets(line, PATH_MAX, fp) != NULL) { llen = strlen(line); @@ -106,15 +107,15 @@ } else if (strcmp(cmd, "@add") == 0) { pl = calloc(1, sizeof(*pl)); strlcpy(pl->filename, p, PATH_MAX); - SLIST_INSERT_HEAD(&pp->pp_add, pl, linkage); + STAILQ_INSERT_TAIL(&pp->pp_add, pl, linkage); } else if (strcmp(cmd, "@remove") == 0) { pl = calloc(1, sizeof(*pl)); strlcpy(pl->filename, p, PATH_MAX); - SLIST_INSERT_HEAD(&pp->pp_remove, pl, linkage); + STAILQ_INSERT_TAIL(&pp->pp_remove, pl, linkage); } else if (strcmp(cmd, "@rmdir") == 0) { pl = calloc(1, sizeof(*pl)); strlcpy(pl->filename, p, PATH_MAX); - SLIST_INSERT_HEAD(&pp->pp_rmdir, pl, linkage); + STAILQ_INSERT_TAIL(&pp->pp_rmdir, pl, linkage); } else if (strcmp(cmd, "@patch") == 0) { pl = calloc(1, sizeof(*pl)); p2 = strchr(p, '['); @@ -125,6 +126,7 @@ */ char m[100], *pm, *p4, *p5; + pm = m; p3 = strchr(p2, ']'); assert(p3-p2 < (int)sizeof(m)); strlcpy(m, p2 + 1, p3 - p2); @@ -132,7 +134,6 @@ while (*p3 == ' ') p3++; strlcpy(pl->filename, p3, PATH_MAX); - pm = m; while ((p4 = strsep(&pm, ",")) != NULL) { p5 = strchr(p4, '='); if (p5 != NULL) @@ -151,7 +152,7 @@ strlcpy(pl->filename, p, PATH_MAX); pl->method = PPMETHOD_CP; } - SLIST_INSERT_HEAD(&pp->pp_patch, pl, linkage); + STAILQ_INSERT_TAIL(&pp->pp_patch, pl, linkage); } else errx(1, "Unknown command: %s", cmd); @@ -186,6 +187,8 @@ dpatch); snprintf(tmp, PATH_MAX, "%s/%s", dpatch, PKGPATCH_FNAME); + + /* Step 1 - read the patch metadata */ read_pkgpatch_file(tmp, &pp); if (pp.version_major != PKGPATCH_VERSION_MAJOR) errx(1, "Invalid patch data format major version number: %d\n", @@ -197,4 +200,6 @@ printf("Read patch data, version %d.%d for '%s' to '%s'\n", pp.version_major, pp.version_minor, pp.source, pp.target); + /* Step 2 - read the existing (live system) package data */ + } ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#4 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#13 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#13 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#14 (text+ko) ==== @@ -60,7 +60,7 @@ proc_args() { int ch; - while ((ch = getopt(argc, argv, "abchv")) != -1) { + while ((ch = getopt(argc, argv, "abcfhv")) != -1) { switch (ch) { case 'a': patch_op = PP_APPLY; @@ -71,6 +71,9 @@ case 'c': patch_op = PP_MKPATCH; break; + case 'f': + Force++; + break; case 'h': usage_short(); exit(0); ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#12 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#12 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#12 (text+ko) ==== @@ -21,10 +21,10 @@ #define _PKG_PATCH_H_ #ifndef _PATH_TAR -#define _PATH_TAR "/usr/bin/tar" +#define _PATH_TAR "/usr/bin/tar" #endif #ifndef _PATH_BSDIFF -#define _PATH_BSDIFF "/usr/bin/bsdiff" +#define _PATH_BSDIFF "/usr/bin/bsdiff" #endif #define PKGPATCH_FNAME "+PKGPATCH" @@ -32,6 +32,11 @@ #define PKGPATCH_VERSION_MINOR 0 #define PKGPATCH_VERSION "1.0" +#ifndef PKG_DBDIR +/* So much cruft... */ +#define PKG_DBDIR LOG_DIR +#endif + enum PP_OP { PP_NONE, PP_MKPATCH, PP_APPLY }; struct pkgxjob { @@ -46,6 +51,22 @@ SLIST_ENTRY(filelist) linkage; }; +STAILQ_HEAD(pkg_plist_head, pkg_plist); +struct pkg_plist { + char name[PATH_MAX]; + plist_t type; + STAILQ_ENTRY(pkg_plist) linkage; +}; + +struct pkg_metadata { + char name[PATH_MAX]; + char origin[PATH_MAX]; + char pkg_format_revision[16]; + char prefix[PATH_MAX]; + struct pkg_plist_head plist; +}; + + #ifndef PKG_PATCH_MAIN extern int argc; @@ -70,5 +91,6 @@ int copy_file_absolute(char *from, char *to); int copy_file_attrs(char *from, struct stat *st_from, char *to); int replicate_dirtree(char *from, char *to); +int read_package(char *name, struct pkg_metadata *pkg); #endif ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#11 (text+ko) ==== @@ -217,23 +217,23 @@ assert(from != NULL); if (lstat(from, &st2) < 0) { warn("copy_file_attrs: lstat(%s) failed", from); - return (errno); + return (-errno); } st = &st2; } if (chown(to, st->st_uid, st->st_gid) < 0) { warn("copy_file_attrs: chown() failed"); - return (errno); + return (-errno); } tv[0].tv_usec = tv[1].tv_usec = 0; tv[0].tv_sec = tv[1].tv_sec = st->st_mtime; if (lutimes(to, tv) < 0) { warn("copy_file_attrs: lutimes(%s,%d) failed", to, st->st_mtime); - return (errno); + return (-errno); } if (lchmod(to, st->st_mode) < 0) { warn("copy_file_attrs: lchmod(%o) failed", st->st_mode); - return (errno); + return (-errno); } return (0); } @@ -322,12 +322,12 @@ if (access(new_dir, F_OK) == 0) continue; if (mkdir(new_dir, 0700) < 0) { - rval = errno; + rval = -errno; goto end; } if (copy_file_attrs(fe->fts_path, fe->fts_statp, new_dir) != 0) { - rval = errno; + rval = -errno; goto end; } } @@ -337,3 +337,64 @@ return (-1); return (rval); } + + +/* + * Reads the package metadata for the given package name in the package database + * structure. The name is a full package name, e.g. "sqlite3-3.6.19". + * Hopefully, one day, someone will make a canonical way to do this instead + * of reinwenting the wheel. The actual format of +CONTENTS is very lame. + */ +int +read_package(char *name, struct pkg_metadata *pkg) +{ + char pfilename[PATH_MAX], line[PATH_MAX]; + FILE *fp; + struct pkg_plist *pl; + int llen, rval; + + snprintf(pfilename, PATH_MAX, "%s/%s/%s", PKG_DBDIR, name, + CONTENTS_FNAME); + if (access(pfilename, R_OK) != 0) { + warn("Cannot access %s for reading.", pfilename); + return (-errno); + } + fp = fopen(pfilename, "r"); + if (fp == NULL) + return (-errno); + + rval = 0; + while (fgets(line, PATH_MAX, fp) != NULL) { + char *p, *cmd; + + llen = strlen(line); + if (line[llen-1] == '\n') { + line[llen-1] = '\0'; /* strip newline */ + llen--; + } + if (line[0] == '\0') + continue; + if (line[0] == CMD_CHAR) { + cmd = line + 1; + p = strchr(line, ' '); + if (p == NULL) { + rval = -1; + goto error; + } + *p++ = '\0'; + if (strcmp(cmd, "comment") == 0) { + } + } else { + pl = calloc(1, sizeof(*pl)); + pl->type = PLIST_FILE; + STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); + } + } + + return (0); +error: + if (fp != NULL) + fclose(fp); + return (rval); +} + From owner-p4-projects@FreeBSD.ORG Sun Jun 20 02:03:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37E251065670; Sun, 20 Jun 2010 02:03:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F038E106566B for ; Sun, 20 Jun 2010 02:03:20 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC7968FC14 for ; Sun, 20 Jun 2010 02:03:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5K23K4E030034 for ; Sun, 20 Jun 2010 02:03:20 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5K23KEi030032 for perforce@freebsd.org; Sun, 20 Jun 2010 02:03:20 GMT (envelope-from ligregni@FreeBSD.org) Date: Sun, 20 Jun 2010 02:03:20 GMT Message-Id: <201006200203.o5K23KEi030032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2010 02:03:21 -0000 http://p4web.freebsd.org/@@179951?ac=10 Change 179951 by ligregni@ligPhenom on 2010/06/20 02:02:49 Main daemon logic implemented, pending the network work... Affected files ... .. //depot/projects/soc2010/disaudit/ideas.txt#3 edit .. //depot/projects/soc2010/disaudit/shipd.c#3 edit .. //depot/projects/soc2010/disaudit/shipd.h#3 edit Differences ... ==== //depot/projects/soc2010/disaudit/ideas.txt#3 (text+ko) ==== @@ -1,18 +1,18 @@ /*- * Copyright (c) 2010 - * Sergio Ligregni. All rights reserved. + * Sergio Ligregni . All rights reserved. */ DisAudit Project PARAMETERS (the main idea is to get them from /etc/security/audit_control) -disaudit_type:master # master, slave, obviouslly depending on this to use the following parameters +disaudit_type:master # none, master, slave, obviouslly depending on this to use the following parameters /* SLAVE */ -disaudit_slave_level:0 # 0=disabled +disaudit_slave_level:1 # 0=disabled # 1=only when a trail closes (audit will call "shipd -l", # the last closed trail will be delivered without checkings) # 2=the daemon will perform a comparisson in the master system @@ -25,6 +25,9 @@ # because a newer trail is ok, this options are available # to let the admin tune the system and choose between performance # or trustiness (maybe the admin only needs the last slave's trail ok) +disaudit_slave_init_level:3 # same as above, but this time only 2 or 3 allowed, it will do the same + # at startup, maybe we can use level 1 but when system starts check for all + # like here: 1, 3 (the 2 remember, is to check for the latest ones) disaudit_slave_msec:15000 # the frequency wich slave system will be doing the lists comparissons # and syncronizing both directories of trails disaudit_slave_mhost:masterHost # the master host (maybe we will allow IP address here) ==== //depot/projects/soc2010/disaudit/shipd.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2010 - * Sergio Ligregni. All rights reserved. + * Sergio Ligregni . All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,11 +25,17 @@ * */ +/*** INCLUDES ***/ + #include "shipd.h" -#include "/usr/include/stdio.h" -#include "/usr/include/stdlib.h" +#include +#include +#include +#include #include #include +#include +#include /*** DECLARATIONS ***/ @@ -37,13 +43,21 @@ char audit_trails_dir[MAX_DIR_SIZE + 1]; char master_host[MAX_HOST_SIZE + 1]; -/* The level of trust the shipping process will have */ +/* The level of trust the shipping process will have (0 means disabled) */ int panic_level; +/* The frequency the daemon will be checking the master's trail list */ +int msec_freq; + +/* Two main things to be set by this variable, if daemonize or not, and the destination of the messages */ +int debug; + main (int argc, char *argv[]) { - int debug = 0, last = 0; char cl_opt; + int last = 0; + + debug = 0; while ((cl_opt = getopt(argc, argv, "dl")) != -1) switch (cl_opt) @@ -79,6 +93,12 @@ exit(0); } + /* This means that the daemon will only search for the last closed trail and send to the master system */ + if (last == 1) + do_last(); + else /* Otherwise, we will perform a permanent listing checking and sync them */ + do_daemon(); + return 0; } @@ -97,6 +117,7 @@ fscanf(fpars, "%s", audit_trails_dir); fscanf(fpars, "%s", master_host); fscanf(fpars, "%d", &panic_level); + fscanf(fpars, "%d", &msec_freq); return 0; } @@ -104,6 +125,304 @@ void to_log(char *message) { - syslog(LOG_ERR, "%s", message); + if (debug) + perror(message); + else + syslog(LOG_ERR, "%s", message); +} + +void +do_last() +{ + char last_trail[MAX_PATH_SIZE + 1]; + char message[MAX_PATH_SIZE + 30]; + + if (get_last_trail(last_trail) == -1) + to_log("Nothing to send!"); + + sprintf(message, "Will send \"%s\" to %s", last_trail, master_host); + + to_log(message); + + if (send_trail(last_trail) == -1) + to_log("Error sending the last trail"); + else + { + sprintf(message, "Successfully sent \"%s\" to %s", last_trail, master_host); + to_log(message); + } +} + +int +get_last_trail(char *path) +{ + DIR *dp; + struct dirent *dirp; + struct stat statbuf; + + char fullpath[MAX_PATH_SIZE + 1]; + char *ptr; + + *path = 0; + + if ( !(dp = opendir(audit_trails_dir)) ) + { + to_log("Can't open directory"); + return -1; + } + + strcpy(fullpath, audit_trails_dir); + ptr = fullpath + strlen(fullpath); + *ptr = '/'; + *(++ptr) = 0; + + /* Here we will pass through the entire directory and get the path of the latest closed trail */ + + while ( (dirp = readdir(dp)) != NULL ) + if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) /* We have other than . or .. */ + { + strcpy(ptr, dirp->d_name); + + if ( stat(fullpath, &statbuf) < 0 ) + { + to_log("Stat error!"); + return -1; + } + + if (S_ISDIR(statbuf.st_mode) == 0) /* It's not a directory */ + { + if ( is_audit_trail(dirp->d_name) ) /* It's not other file */ + { + if (*path == 0) /* This is our first trail, so assumme is the last */ + strcpy(path, fullpath); + else if (strcmp (path, fullpath) < 0) /* Fortunately, the older a trail is, the lower lexocographic value it has */ + strcpy(path, fullpath); + } + } + } + + closedir(dp); + + return 0; +} + +int +is_audit_trail(char *path) +{ + /* + * We have these posibilities, only the first one is allowed + * 20100619223115.20100619223131 + * 20100619223131.not_terminated + * current + */ + + if (strlen(path) == 29 && path[14] == '.' && isdigit(path[15])) /* To improve this checking later */ + return 1; + return 0; +} + +void +do_daemon() +{ + while (1) + { + switch (panic_level) + { + case PANIC_DATE: + do_daemon_date(); + break; + case PANIC_ALL: + do_daemon_all(); + break; + } + + usleep(msec_freq * 1000); /* Since we have miliseconds and this function receives microseconds */ + } +} + +int +send_trail(char *path) +{ + return 0; +} + +/* + * This function will search in the master system the + * newest correct trail and sync from it to the last + * closed trail + */ +void do_daemon_date() +{ + DIR *dp; + struct dirent *dirp; + struct stat statbuf; + + char fullpath[MAX_PATH_SIZE + 1]; + char message[MAX_PATH_SIZE + 30]; + char *ptr; + + int n_elements = 0, i; + + if ( !(dp = opendir(audit_trails_dir)) ) + { + to_log("Can't open directory"); + return; + } + + /* Fancy way to use the fullpath */ + strcpy(fullpath, audit_trails_dir); + ptr = fullpath + strlen(fullpath); + *ptr = '/'; + *(++ptr) = 0; + + /* We must count the elements (just the valid ones, this is: the trails) of the directory */ + while ( (dirp = readdir(dp)) != NULL ) + if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) /* We have other than . or .. */ + { + strcpy(ptr, dirp->d_name); + + if ( stat(fullpath, &statbuf) < 0 ) + { + to_log("Stat error!"); + return; + } + + if (S_ISDIR(statbuf.st_mode) == 0) /* It's not a directory */ + if ( is_audit_trail(dirp->d_name) ) /* It's not other file */ + ++n_elements; + } + + /* Needed to sort the trail names */ + char **trail_paths = (char **) malloc(sizeof(char *) * n_elements); + for (i=0; id_name, ".") && strcmp(dirp->d_name, "..")) /* We have other than . or .. */ + { + strcpy(ptr, dirp->d_name); + + if ( stat(fullpath, &statbuf) < 0 ) + { + to_log("Stat error!"); + return; + } + + if (S_ISDIR(statbuf.st_mode) == 0) /* It's not a directory */ + if ( is_audit_trail(dirp->d_name) ) /* It's not other file */ + strcpy(trail_paths[n_elements++], dirp->d_name); + } + + closedir(dp); + + /* Sort the trails lexicographically (fortunatelly it's the same than sorting per date thanks to the name structure) */ + qsort(trail_paths, n_elements, sizeof(*trail_paths), cmp_trails); + + for (i=0; i0; --i) + free(trail_paths[i]); + free(trail_paths); + + return; +} + +int cmp_trails (const void *A, const void *B) +{ + if (strcmp(*((char **)A), *((char **)B)) < 0) + return 1; + return -1; +} + +int is_in_master(char *path) +{ + return 0; +} + + +/* + * This function will make sure that ALL the trails + * of the slave system are on master system + */ +void do_daemon_all() +{ + DIR *dp; + struct dirent *dirp; + struct stat statbuf; + + char fullpath[MAX_PATH_SIZE + 1]; + char message[MAX_PATH_SIZE + 30]; + char *ptr; + + if ( !(dp = opendir(audit_trails_dir)) ) + { + to_log("Can't open directory"); + return; + } + + /* Fancy way to use the fullpath */ + strcpy(fullpath, audit_trails_dir); + ptr = fullpath + strlen(fullpath); + *ptr = '/'; + *(++ptr) = 0; + + /* We must count the elements (just the valid ones, this is: the trails) of the directory */ + while ( (dirp = readdir(dp)) != NULL ) + if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) /* We have other than . or .. */ + { + strcpy(ptr, dirp->d_name); + + if ( stat(fullpath, &statbuf) < 0 ) + { + to_log("Stat error!"); + return; + } + + if (S_ISDIR(statbuf.st_mode) == 0) /* It's not a directory */ + if ( is_audit_trail(dirp->d_name) ) /* It's not other file */ + if ( !is_in_master(dirp->d_name) ) + if (send_trail(fullpath) == -1) + { + sprintf(message, "ERROR Sending \"%s\" to %s", fullpath, master_host); + to_log(message); + } + else + { + sprintf(message, "Successfully sent \"%s\" to %s", fullpath, master_host); + to_log(message); + } + } + + closedir(dp); + + return; } ==== //depot/projects/soc2010/disaudit/shipd.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2010 - * Sergio Ligregni. All rights reserved. + * Sergio Ligregni . All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,9 +29,23 @@ #define _SHIPD_H_ #define MAX_DIR_SIZE 255 +#define MAX_PATH_SIZE MAX_DIR_SIZE + 50 #define MAX_HOST_SIZE 255 +#define MAX_TRAILPATH_SIZE 29 +#define PANIC_DATE 2 +#define PANIC_ALL 3 int get_parameters(); -void to_log(); +void to_log(char *); +void do_last(); +void do_daemon(); +int get_last_trail(char *); +int is_audit_trail(char *); +int send_trail(char *); +void do_daemon_date(); +int cmp_trails(const void *, const void *); +int is_in_master(char *); +void do_daemon_all(); + #endif From owner-p4-projects@FreeBSD.ORG Sun Jun 20 08:31:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEA511065675; Sun, 20 Jun 2010 08:31:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 754351065673 for ; Sun, 20 Jun 2010 08:31:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 611948FC18 for ; Sun, 20 Jun 2010 08:31:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5K8VSmg076639 for ; Sun, 20 Jun 2010 08:31:28 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5K8VP7Q076633 for perforce@freebsd.org; Sun, 20 Jun 2010 08:31:25 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 20 Jun 2010 08:31:25 GMT Message-Id: <201006200831.o5K8VP7Q076633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2010 08:31:29 -0000 http://p4web.freebsd.org/@@179956?ac=10 Change 179956 by pgj@csupor on 2010/06/20 08:30:59 IFC @179923 Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/chio/chio.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/cp/cp.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/date/date.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/pat_rep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/eval.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/histedit.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/jobs.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/main.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/myhistedit.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/parser.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/sh.1#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/var.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/var.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/bfd/archures.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/bfd/bfd-in2.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/bfd/cpu-mips.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/bfd/elfxx-mips.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/gas/config/tc-mips.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/include/elf/mips.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/include/opcode/mips.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/opcodes/mips-dis.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/opcodes/mips-opc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/opcodes/mips16-opc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmpd/snmpmod.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/fixdfdi.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/fixsfdi.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/fixunsdfsi.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/fixunssfsi.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/floatdidf.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/floatdisf.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/floatundidf.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/floatundisf.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/mips/freebsd.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/mips/mips.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/mips/mips.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/mips/mips.md#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/CREDITS.TXT#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/LICENSE.TXT#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/Makefile.common#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/Makefile.config.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/Makefile.rules#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/ModuleInfo.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/README.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/AutoRegen.sh#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/ExportMap.map#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/LICENSE.TXT#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/README.TXT#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/config.guess#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/config.sub#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/configure.ac#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/depcomp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/install-sh#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/ltmain.sh#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/bison.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/build_exeext.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/c_printf_a.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/check_gnu_make.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/config_makefile.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/config_project.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/cxx_bidi_iterator.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/cxx_flag_check.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/cxx_fwd_iterator.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/cxx_namespaces.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/cxx_std_iterator.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/find_std_program.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/flex.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/func_isinf.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/func_isnan.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/func_mmap_file.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/header_mmap_anonymous.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/huge_val.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/libtool.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/link_options.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/linux_mixed_64_32.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/ltdl.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/need_dev_zero_for_mmap.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/path_perl.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/path_tclsh.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/rand48.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/sanity_check.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/single_cxx_check.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/m4/visibility_inlines_hidden.m4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/missing#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/autoconf/mkinstalldirs#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/README.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/analysis/llvm_analysis-binding.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/analysis/llvm_analysis.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/analysis/llvm_analysis_wrap.cxx#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader-binding.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/bitreader/llvm_bitreader_wrap.cxx#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer-binding.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/bitwriter/llvm_bitwriter_wrap.cxx#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine-binding.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/executionengine/llvm_executionengine_wrap.cxx#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/llvm.gpr#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/llvm/llvm-binding.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/llvm/llvm.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer-binding.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/llvm/llvm_linktimeoptimizer_wrap.cxx#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/llvm/llvm_wrap.cxx#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/target/llvm_target-binding.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/target/llvm_target.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/target/llvm_target_wrap.cxx#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/transforms/llvm_transforms-binding.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/transforms/llvm_transforms.ads#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ada/transforms/llvm_transforms_wrap.cxx#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/Makefile.ocaml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/analysis/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/analysis/analysis_ocaml.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.ml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.mli#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/bitreader/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/bitreader/bitreader_ocaml.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.ml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.mli#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/bitwriter/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/bitwriter/bitwriter_ocaml.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.ml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.mli#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/executionengine/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.ml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.mli#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/llvm/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/llvm/llvm.ml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/llvm/llvm.mli#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/llvm/llvm_ocaml.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/target/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/target/llvm_target.ml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/target/llvm_target.mli#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/target/target_ocaml.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/transforms/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/transforms/scalar/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.ml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.mli#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/bindings/ocaml/transforms/scalar/scalar_opts_ocaml.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/build-for-llvm-top.sh#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/configure#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/Analysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/BitReader.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/BitWriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/Core.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/EnhancedDisassembly.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/ExecutionEngine.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/Target.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/Transforms/IPO.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/Transforms/Scalar.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm-c/lto.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/APFloat.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/APInt.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/APSInt.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/BitVector.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/DeltaAlgorithm.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/DenseMap.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/DenseMapInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/DenseSet.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/DepthFirstIterator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/FoldingSet.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/GraphTraits.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/ImmutableList.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/ImmutableMap.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/ImmutableSet.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/IndexedMap.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/Optional.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/OwningPtr.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/PointerIntPair.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/PointerUnion.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/PostOrderIterator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/PriorityQueue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SCCIterator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/STLExtras.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/ScopedHashTable.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SetOperations.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SetVector.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SmallBitVector.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SmallPtrSet.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SmallSet.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SmallString.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SmallVector.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/SparseBitVector.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/Statistic.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/StringExtras.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/StringMap.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/StringRef.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/StringSet.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/StringSwitch.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/Trie.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/Triple.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/Twine.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/UniqueVector.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/ValueMap.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/VectorExtras.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/ilist.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/ilist_node.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/iterator.cmake#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ADT/iterator.h.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/AbstractTypeUser.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/CFGPrinter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/CallGraph.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/CaptureTracking.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ConstantFolding.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ConstantsScanner.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/DebugInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/DomPrinter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/DominatorInternals.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/Dominators.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/IVUsers.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/InlineCost.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/Interval.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/IntervalIterator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/IntervalPartition.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/Lint.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/LiveValues.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/LoopInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/LoopPass.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/PHITransAddr.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/Passes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/PointerTracking.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/PostDominators.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ProfileInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ProfileInfoLoader.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ProfileInfoTypes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ScalarEvolutionNormalization.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/SparsePropagation.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/Trace.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/ValueTracking.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Analysis/Verifier.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Argument.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Assembly/AsmAnnotationWriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Assembly/Parser.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Assembly/PrintModulePass.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Assembly/Writer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Attributes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/AutoUpgrade.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/BasicBlock.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Bitcode/Archive.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Bitcode/BitCodes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CallGraphSCCPass.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CallingConv.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/Analysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/BinaryObject.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/FastISel.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/GCMetadata.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/GCMetadataPrinter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/GCStrategy.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/GCs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/IntrinsicLowering.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/LatencyPriorityQueue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/LinkAllAsmWriterComponents.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/LiveVariables.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachORelocation.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineCodeInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineDominators.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineJumpTableInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineLocation.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineModuleInfoImpls.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachinePassRegistry.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineRelocation.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/MachineSSAUpdater.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/ObjectCodeEmitter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/Passes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/PseudoSourceValue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/RegAllocRegistry.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/ScheduleHazardRecognizer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/SchedulerRegistry.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CodeGen/ValueTypes.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/Action.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/BuiltinOptions.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/Common.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/Error.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/ForceLinkage.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/ForceLinkageMacros.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/Main.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/Plugin.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/CompilerDriver/Tool.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Config/AsmParsers.def.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Config/AsmPrinters.def.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Config/Disassemblers.def.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Config/Targets.def.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Config/config.h.cmake#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Config/config.h.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Constant.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Constants.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/DerivedTypes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ExecutionEngine/GenericValue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ExecutionEngine/Interpreter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ExecutionEngine/JIT.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Function.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/GVMaterializer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/GlobalAlias.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/GlobalValue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/GlobalVariable.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/InlineAsm.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/InstrTypes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Instruction.def#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Instruction.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Instructions.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/IntrinsicInst.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Intrinsics.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Intrinsics.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/IntrinsicsARM.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/IntrinsicsAlpha.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/IntrinsicsCellSPU.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/IntrinsicsPowerPC.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/IntrinsicsX86.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/IntrinsicsXCore.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/LLVMContext.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/LinkAllPasses.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/LinkAllVMCore.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Linker.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/EDInstInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCAsmInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCAsmInfoCOFF.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCAsmInfoDarwin.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCAsmLayout.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCAssembler.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCCodeEmitter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCContext.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCDirectives.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCDisassembler.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCExpr.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCFixup.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCInst.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCInstPrinter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCLabel.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCMachOSymbolFlags.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCObjectWriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCParser/AsmCond.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCParser/AsmParser.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCSection.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCSectionCOFF.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCSectionELF.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCSectionMachO.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCStreamer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCSymbol.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MCValue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/MachObjectWriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/MC/SectionKind.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Metadata.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Module.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/OperandTraits.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Operator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Pass.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/PassAnalysisSupport.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/PassManager.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/PassManagers.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/PassSupport.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/AlignOf.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Allocator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/CFG.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/CallSite.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Casting.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/CommandLine.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Compiler.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/ConstantFolder.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/ConstantRange.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/DOTGraphTraits.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/DataFlow.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/DataTypes.h.cmake#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/DataTypes.h.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Debug.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/DebugLoc.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Dwarf.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/DynamicLinker.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/ELF.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/ErrorHandling.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/FileUtilities.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Format.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/FormattedStream.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/GetElementPtrTypeIterator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/GraphWriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/IRBuilder.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/IRReader.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/InstIterator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/InstVisitor.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/LeakDetector.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/MachO.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/ManagedStatic.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/MathExtras.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/MemoryBuffer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/MemoryObject.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/MutexGuard.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/NoFolder.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/OutputBuffer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/PassNameParser.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/PatternMatch.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/PluginLoader.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/PointerLikeTypeTraits.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/PredIteratorCache.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/PrettyStackTrace.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Recycler.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/RecyclingAllocator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Regex.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Registry.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/RegistryParser.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/SMLoc.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/SlowOperationInformer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/SourceMgr.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/StableBasicBlockNumbering.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/StandardPasses.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/StringPool.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/SystemUtils.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/TargetFolder.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/Timer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/TypeBuilder.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/ValueHandle.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/circular_raw_ostream.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/raw_os_ostream.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/raw_ostream.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Support/type_traits.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/SymbolTableListTraits.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/AIXDataTypesFix.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Alarm.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Atomic.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/DataTypes.h.cmake#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/DataTypes.h.in#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Disassembler.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/DynamicLibrary.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Errno.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Host.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/IncludeFile.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/LICENSE.TXT#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Memory.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Mutex.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Path.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Process.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Program.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/RWMutex.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Signals.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Solaris.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/ThreadLocal.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Threading.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/TimeValue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/System/Valgrind.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/Mangler.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/SubtargetFeature.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/Target.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetAsmBackend.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetAsmLexer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetAsmParser.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetCallingConv.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetData.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetFrameInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetIntrinsicInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetJITInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetLowering.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetMachine.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetOpcodes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetOptions.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetRegistry.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetSchedule.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetSelect.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetSelectionDAGInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Target/TargetSubtarget.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/IPO.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Instrumentation.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/RSProfiling.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Scalar.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/AddrModeMatcher.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/BasicInliner.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/FunctionUtils.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/Local.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/PromoteMemToReg.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdaterImpl.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/SSI.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Transforms/Utils/UnrollLoop.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Type.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/TypeSymbolTable.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Use.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/User.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/Value.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/include/llvm/ValueSymbolTable.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/AliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/AliasDebugger.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/AliasSetTracker.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/Analysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/CFGPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/CaptureTracking.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ConstantFolding.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/DebugInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/DomPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/IPA/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/IPA/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/IVUsers.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/InlineCost.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/InstCount.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/Interval.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/IntervalPartition.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/LazyValueInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/LibCallSemantics.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/Lint.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/LiveValues.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/LoopInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/LoopPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/PHITransAddr.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/PointerTracking.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/PostDominators.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ProfileInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ProfileInfoLoader.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/README.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/SparsePropagation.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/Trace.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Analysis/ValueTracking.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Archive/Archive.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Archive/ArchiveInternals.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Archive/ArchiveReader.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Archive/ArchiveWriter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Archive/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Archive/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/AsmParser/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/AsmParser/LLLexer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/AsmParser/LLLexer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/AsmParser/LLParser.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/AsmParser/LLParser.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/AsmParser/LLToken.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/AsmParser/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/AsmParser/Parser.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Reader/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Reader/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Writer/BitWriter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Writer/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Writer/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/Analysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AntiDepBreaker.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/BranchFolding.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/BranchFolding.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ELF.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ELFWriter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ELFWriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/GCMetadata.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/GCMetadataPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/GCStrategy.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/IfConversion.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/LiveInterval.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/LiveVariables.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/LowerSubregs.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineCSE.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineDominators.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineFunction.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineFunctionPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineInstr.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineLICM.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachinePassRegistry.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineSSAUpdater.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineSink.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ObjectCodeEmitter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/OcamlGC.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/OptimizeExts.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PBQP/Graph.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PBQP/HeuristicBase.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PBQP/HeuristicSolver.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PBQP/Heuristics/Briggs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PBQP/Math.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PBQP/Solution.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PHIElimination.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PHIElimination.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/Passes.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/PseudoSourceValue.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/README.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/RegAllocLocal.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/CallingConvLower.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeOrdering.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SelectionDAG/TargetSelectionDAGInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SimpleHazardRecognizer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/SlotIndexes.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/Spiller.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/Spiller.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/StackProtector.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/TailDuplication.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/VirtRegMap.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/VirtRegMap.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CodeGen/VirtRegRewriter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CompilerDriver/Action.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CompilerDriver/BuiltinOptions.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CompilerDriver/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CompilerDriver/CompilationGraph.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CompilerDriver/Main.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CompilerDriver/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CompilerDriver/Plugin.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/CompilerDriver/Tool.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/Interpreter/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/ExecutionEngine/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Linker/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Linker/LinkArchives.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Linker/LinkItems.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Linker/LinkModules.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Linker/Linker.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Linker/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCAsmInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCAsmStreamer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCAssembler.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCCodeEmitter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCContext.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCDisassembler.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCExpr.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCInst.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCInstPrinter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCLabel.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCLoggingStreamer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCMachOStreamer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCNullStreamer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCObjectWriter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCParser/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCParser/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCSection.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCSectionCOFF.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCSectionELF.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCSectionMachO.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCStreamer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCSymbol.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MCValue.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/MachObjectWriter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/MC/TargetAsmBackend.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/APFloat.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/APInt.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/APSInt.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Allocator.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/COPYRIGHT.regex#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/CommandLine.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/ConstantRange.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Debug.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/DeltaAlgorithm.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Dwarf.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/ErrorHandling.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/FileUtilities.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/FoldingSet.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/FormattedStream.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/GraphWriter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/IsInf.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/IsNAN.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/ManagedStatic.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/MemoryBuffer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/MemoryObject.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/PluginLoader.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/PrettyStackTrace.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Regex.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/SlowOperationInformer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/SmallPtrSet.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/SmallVector.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/SourceMgr.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Statistic.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/StringExtras.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/StringMap.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/StringPool.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/StringRef.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/SystemUtils.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/TargetRegistry.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Timer.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Triple.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/Twine.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/circular_raw_ostream.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/raw_os_ostream.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/raw_ostream.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regcclass.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regcname.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regcomp.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regengine.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regerror.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regex2.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regex_impl.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regexec.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regfree.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regstrlcpy.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Support/regutils.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Alarm.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Atomic.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/CMakeLists.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Disassembler.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/DynamicLibrary.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Errno.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Host.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/IncludeFile.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Memory.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Mutex.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Path.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Process.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Program.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/README.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/RWMutex.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/SearchForAddressOfSpecialSymbol.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Signals.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/ThreadLocal.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Threading.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/TimeValue.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Alarm.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Host.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Memory.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Mutex.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Path.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Process.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Program.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/README.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/RWMutex.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Signals.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/ThreadLocal.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/TimeValue.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Unix/Unix.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Valgrind.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Alarm.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/DynamicLibrary.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Host.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Memory.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Mutex.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Path.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Process.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Program.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/RWMutex.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Signals.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/ThreadLocal.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/TimeValue.inc#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/System/Win32/Win32.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARM.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARM.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMAddressingModes.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMBuildAttrs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMCallingConv.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMFrameInfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMISelLowering.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/llvm/lib/Target/ARM/ARMInstrInfo.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 20 22:29:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E72B1065677; Sun, 20 Jun 2010 22:29:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DB08106564A for ; Sun, 20 Jun 2010 22:29:11 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B7448FC13 for ; Sun, 20 Jun 2010 22:29:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5KMTAXq096681 for ; Sun, 20 Jun 2010 22:29:10 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5KMTAUs096679 for perforce@freebsd.org; Sun, 20 Jun 2010 22:29:10 GMT (envelope-from jceel@freebsd.org) Date: Sun, 20 Jun 2010 22:29:10 GMT Message-Id: <201006202229.o5KMTAUs096679@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2010 22:29:13 -0000 http://p4web.freebsd.org/@@180013?ac=10 Change 180013 by jceel@jceel on 2010/06/20 22:29:03 Implement transfer controller error handling in DaVinci EDMA. Affected files ... .. //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_edma.c#3 edit .. //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_edmareg.h#3 edit Differences ... ==== //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_edma.c#3 (text+ko) ==== @@ -130,6 +130,8 @@ static void davinci_edma_intr_tcerr0(void *); static void davinci_edma_intr_tcerr1(void *); +static void davinci_edma_tcerr(struct davinci_edma_softc *, int); + #define davinci_edma_lock(sc) \ mtx_lock(&sc->ds_mtx) #define davinci_edma_unlock(sc) \ @@ -143,6 +145,10 @@ bus_space_read_4((_sc)->ds_bst, (_sc)->ds_bsh, DAVINCI_EDMACC_BASE + (_reg)) #define davinci_write_edmacc_4(_sc, _reg, _data) \ bus_space_write_4((_sc)->ds_bst, (_sc)->ds_bsh, DAVINCI_EDMACC_BASE + (_reg), (_data)) +#define davinci_read_edmatc_4(_sc, _tc, _reg) \ + bus_space_read_4((_sc)->ds_bst, (_sc)->ds_bsh, DAVINCI_EDMATC ## _tc ## _BASE + (_reg)) +#define davinci_write_edmatc_4(_sc, _tc, _reg) \ + bus_space_write_4((_sc)->ds_bst, (_sc)->ds_bsh, DAVINCI_EDMATC ## _tc ## _BASE + (_reg), (_data)) #define davinci_edma_copydesc(_sc, _desc, _idx) \ memcpy((uint8_t *)(DAVINCI_EDMA_BASE + DAVINCI_EDMA_PARAM(_idx)), (_desc), sizeof(param_desc)) @@ -419,16 +425,15 @@ if (xfer->dt_callback != NULL) { xfer->dt_callback(DMAE_TRANSFER_COMPLETED, + xfer->dt_callback_arg); } ch->dc_status = 0; davinci_write_edmacc_4(sc, DAVINCI_EDMACC_ICRH, (1 << (chno-32))); - ipr &= ~(1 << (chno - 32)); + iprh &= ~(1 << (chno - 32)); } } - - debugf("interrupt servicing done"); } static void @@ -486,14 +491,44 @@ davinci_edma_intr_tcerr0(void *arg) { struct davinci_edma_softc *sc = (struct davinci_edma_softc *)arg; - device_printf(sc->ds_dev, "edma_intr_tcerr0\n"); + + davinci_edma_tcerr(sc, 0); } static void davinci_edma_intr_tcerr1(void *arg) { struct davinci_edma_softc *sc = (struct davinci_edma_softc *)arg; - device_printf(sc->ds_dev, "edma_intr_tcerr1\n"); + + davinci_edma_tcerr(sc, 1); +} + +static void +davinci_edma_tcerr(struct davinci_edma_softc *sc, int tc) +{ + struct davinci_edma_channel *ch; + struct dmae_transfer *xfer; + uint32_t errstat, errdet; + int chno; + + if (tc == 0) { + errstat = davinci_read_edmatc_4(sc, 0, DAVINCI_EDMATC_ERRSTAT); + errdet = davinci_read_edmatc_4(sc, 0, DAVINCI_EDMATC_ERRDET); + } else { + errstat = davinci_read_edmatc_4(sc, 1, DAVINCI_EDMATC_ERRSTAT); + errdet = davinci_read_edmatc_4(sc, 1, DAVINCI_EDMATC_ERRDET); + } + + chno = (errstat >> DAVINCI_EDMATC_ERRDET_TCCSHIFT) & + DAVINCI_EDMATC_ERRDET_TCCMASK; + + ch = &sc->ds_channels[chno]; + xfer = dc->dc_xfer; + + if (xfer->dt_callback != NULL) { + xfer->dt_callback(DMAE_TRANSFER_ERROR, + xfer->dt_callback_arg); + } } static device_method_t davinci_edma_methods[] = { ==== //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_edmareg.h#3 (text+ko) ==== @@ -110,6 +110,9 @@ #define DAVINCI_EDMATC_ERREN 0x124 #define DAVINCI_EDMATC_ERRCLR 0x128 #define DAVINCI_EDMATC_ERRDET 0x12c +#define DAVINCI_EDMATC_ERRDET_TCCSHIFT 8 +#define DAVINCI_EDMATC_ERRDET_TCCMASK 0x3f +#define DAVINCI_EDMATC_ERRDET_STATMASK 0xf #define DAVINCI_EDMATC_ERRCMD 0x130 /* to be continued... */ From owner-p4-projects@FreeBSD.ORG Mon Jun 21 00:45:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D614A1065672; Mon, 21 Jun 2010 00:45:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99E24106564A for ; Mon, 21 Jun 2010 00:45:42 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 85C0C8FC15 for ; Mon, 21 Jun 2010 00:45:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5L0jgdi009140 for ; Mon, 21 Jun 2010 00:45:42 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5L0jgZ3009138 for perforce@freebsd.org; Mon, 21 Jun 2010 00:45:42 GMT (envelope-from ivoras@FreeBSD.org) Date: Mon, 21 Jun 2010 00:45:42 GMT Message-Id: <201006210045.o5L0jgZ3009138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 00:45:43 -0000 http://p4web.freebsd.org/@@180026?ac=10 Change 180026 by ivoras@betelgeuse on 2010/06/21 00:45:03 Finished most of +CONTENTS reading code, still a few things to go and certainly edge-cases resulting from the uglyness and adhockery of the format. Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#15 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#5 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#5 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#14 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#14 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#15 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#13 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#13 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#13 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#12 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#15 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ }; -struct pkgpatch { +struct pkg_patch { short int version_major; short int version_minor; char source[PATH_MAX]; @@ -60,7 +60,7 @@ static void -read_pkgpatch_file(char *filename, struct pkgpatch *pp) +read_pkgpatch_file(char *filename, struct pkg_patch *pp) { FILE *fp; char line[PATH_MAX], *p, *p2, *p3, *cmd; @@ -166,7 +166,8 @@ { char fpatch[PATH_MAX], dpatch[PATH_MAX], tmp[PATH_MAX]; struct pkgxjob xpatch; - struct pkgpatch pp; + struct pkg_patch pp; + struct pkg_metadata pkg_live; if (argc < 1) errx(1, "Expecting argument: patch filename"); @@ -180,7 +181,7 @@ if (mkdir(dpatch, 0700) != 0) err(1, "Cannot create directory: %s", dpatch); if (pkgxjob_start(&xpatch, dpatch, fpatch) != 0) - err(1, "Canot extract package %s to %s (start)", fpatch, + err(1, "Cannot extract package %s to %s (start)", fpatch, dpatch); if (pkgxjob_finish(&xpatch) != 0) err(1, "Cannot extract package %s to %s (finish)", fpatch, @@ -201,5 +202,9 @@ pp.version_major, pp.version_minor, pp.source, pp.target); /* Step 2 - read the existing (live system) package data */ + if (read_package_by_name(pp.source, &pkg_live) != 0) + err(1, "Cannot read package information for %s", pp.source); + + dump_package_info(&pkg_live); } ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#5 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#14 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#14 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#15 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#13 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#13 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#13 (text+ko) ==== @@ -32,10 +32,6 @@ #define PKGPATCH_VERSION_MINOR 0 #define PKGPATCH_VERSION "1.0" -#ifndef PKG_DBDIR -/* So much cruft... */ -#define PKG_DBDIR LOG_DIR -#endif enum PP_OP { PP_NONE, PP_MKPATCH, PP_APPLY }; @@ -51,19 +47,37 @@ SLIST_ENTRY(filelist) linkage; }; + +SLIST_HEAD(pathlist_head, pathlist); +struct pathlist { + char path[PATH_MAX]; + SLIST_ENTRY(pathlist) linkage; +}; + + STAILQ_HEAD(pkg_plist_head, pkg_plist); struct pkg_plist { char name[PATH_MAX]; + union { + char md5[33]; + char deporigin[PATH_MAX]; + } param; plist_t type; + unsigned flags; STAILQ_ENTRY(pkg_plist) linkage; }; +#define PLIST_FLAG_IGNORE 1 struct pkg_metadata { char name[PATH_MAX]; char origin[PATH_MAX]; char pkg_format_revision[16]; char prefix[PATH_MAX]; + char display[PATH_MAX]; + char mtree[PATH_MAX]; struct pkg_plist_head plist; + struct pathlist_head conflicts; + struct pathlist_head unknown_comments; }; @@ -91,6 +105,8 @@ int copy_file_absolute(char *from, char *to); int copy_file_attrs(char *from, struct stat *st_from, char *to); int replicate_dirtree(char *from, char *to); -int read_package(char *name, struct pkg_metadata *pkg); +int read_package(FILE *fp, struct pkg_metadata *pkg); +int read_package_by_name(char *name, struct pkg_metadata *pkg); +void dump_package_info(struct pkg_metadata *pkg); #endif ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#12 (text+ko) ==== @@ -340,28 +340,122 @@ /* - * Reads the package metadata for the given package name in the package database - * structure. The name is a full package name, e.g. "sqlite3-3.6.19". - * Hopefully, one day, someone will make a canonical way to do this instead - * of reinwenting the wheel. The actual format of +CONTENTS is very lame. + * Parse the comment as if it were stand-alone, adding to package metadata. + * Destructive on cmt. + */ +static void +parse_pkg_comment(struct pkg_metadata *pkg, char *cmt) +{ + char *v; + struct pathlist *plcmt; + + if ((v = strchr(cmt, ':')) == NULL) + goto unknown_comment; + *v++ = '\0'; + if (strcmp(cmt, "PKG_FORMAT_REVISION") == 0) + strncpy(pkg->pkg_format_revision, v, + sizeof(pkg->pkg_format_revision)); + else if (strcmp(cmt, "ORIGIN") == 0) + strncpy(pkg->origin, v, sizeof(pkg->origin)); + else { + *(--v) = ':'; + goto unknown_comment; + } + return; +unknown_comment: + plcmt = calloc(1, sizeof(*plcmt)); + strncpy(plcmt->path, cmt, sizeof(plcmt->path)); + SLIST_INSERT_HEAD(&pkg->unknown_comments, plcmt, linkage); +} + + +/* + * Parse the comment and assign it to plist (if possible). Destructive on cmt. */ +static void +parse_plist_comment(struct pkg_metadata *pkg, struct pkg_plist *pl, char *cmt) +{ + char *v; + struct pathlist *plcmt; + + if ((v = strchr(cmt, ':')) == NULL) + goto unknown_comment; + *v++ = '\0'; + if (strcmp(cmt, "MD5") == 0) + strncpy(pl->param.md5, v, sizeof(pl->param.md5)); + else if (strcmp(cmt, "DEPORIGIN") == 0) { + if (pl->type != PLIST_PKGDEP) { + warnx("DEPORIGIN not set on @pkgdep? (%s:%s)", cmt, v); + return; + } + strncpy(pl->param.deporigin, v, sizeof(pl->param.deporigin)); + } else { + *(--v) = ':'; + goto unknown_comment; + } + return; +unknown_comment: + plcmt = calloc(1, sizeof(*plcmt)); + strncpy(plcmt->path, cmt, sizeof(plcmt->path)); + SLIST_INSERT_HEAD(&pkg->unknown_comments, plcmt, linkage); +} + + +/* Parse @conflicts */ +static void +parse_pkg_conflicts(struct pkg_metadata *pkg, char *cfl) +{ + struct pathlist *pcfl; + + pcfl = calloc(1, sizeof(*pcfl)); + strncpy(pcfl->path, cfl, sizeof(pcfl->path)); + SLIST_INSERT_HEAD(&pkg->conflicts, pcfl, linkage); +} + + +/* + * Reads the package +CONTENTS file into the struct pkg_metadata. + */ int -read_package(char *name, struct pkg_metadata *pkg) +read_package_by_name(char *name, struct pkg_metadata *pkg) { - char pfilename[PATH_MAX], line[PATH_MAX]; + char pfilename[PATH_MAX]; FILE *fp; - struct pkg_plist *pl; - int llen, rval; + int rval; - snprintf(pfilename, PATH_MAX, "%s/%s/%s", PKG_DBDIR, name, + snprintf(pfilename, PATH_MAX, "%s/%s/%s", LOG_DIR, name, CONTENTS_FNAME); if (access(pfilename, R_OK) != 0) { - warn("Cannot access %s for reading.", pfilename); + warn("Cannot access %s for reading", pfilename); return (-errno); } fp = fopen(pfilename, "r"); - if (fp == NULL) + if (fp == NULL) { + warn("Cannot open filename: %s", pfilename); return (-errno); + } + rval = read_package(fp, pkg); + fclose(fp); + return (rval); +} + + +/* + * Reads the package metadata for the given package name in the package database + * structure. The name is a full package name, e.g. "sqlite3-3.6.19". + * Hopefully, one day, someone will make a canonical way to do this instead + * of reinwenting the wheel. The actual format of +CONTENTS is very lame. + */ +int +read_package(FILE *fp, struct pkg_metadata *pkg) +{ + char line[PATH_MAX]; + struct pkg_plist *pl = NULL; + int llen, rval; + + STAILQ_INIT(&pkg->plist); + SLIST_INIT(&pkg->conflicts); + SLIST_INIT(&pkg->unknown_comments); rval = 0; while (fgets(line, PATH_MAX, fp) != NULL) { @@ -374,27 +468,93 @@ } if (line[0] == '\0') continue; + /*printf("%s\n", line);*/ if (line[0] == CMD_CHAR) { cmd = line + 1; p = strchr(line, ' '); - if (p == NULL) { - rval = -1; - goto error; - } + if (p == NULL) + p = line + llen; *p++ = '\0'; if (strcmp(cmd, "comment") == 0) { - } + if (pl != NULL) + /* Comment on a plist entry? */ + parse_plist_comment(pkg, pl, p); + else + /* Comment on the package? */ + parse_pkg_comment(pkg, p); + } else if (strcmp(cmd, "name") == 0) { + strncpy(pkg->name, p, sizeof(pkg->name)); + pl = NULL; + } else if (strcmp(cmd, "cwd") == 0) { + if (strcmp(p, ".") != 0) { + strncpy(pkg->prefix, p, sizeof(pkg->prefix)); + pl = NULL; + } + } else if (strcmp(cmd, "display") == 0) { + strncpy(pkg->display, p, sizeof(pkg->display)); + /*pl = NULL;*/ + } else if (strcmp(cmd, "mtree") == 0) { + strncpy(pkg->mtree, p, sizeof(pkg->mtree)); + /*pl = NULL;*/ + } else if (strcmp(cmd, "pkgdep") == 0) { + pl = calloc(1, sizeof(*pl)); + pl->type = PLIST_PKGDEP; + strncpy(pl->name, p, sizeof(pl->name)); + STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); + } else if (strcmp(cmd, "conflicts") == 0) { + parse_pkg_conflicts(pkg, p); + pl = NULL; + } else if (strcmp(cmd, "exec") == 0) { + pl = calloc(1, sizeof(*pl)); + pl->type = PLIST_CMD; + strncpy(pl->name, p, sizeof(pl->name)); + STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); + } else if (strcmp(cmd, "unexec") == 0) { + pl = calloc(1, sizeof(*pl)); + pl->type = PLIST_UNEXEC; + strncpy(pl->name, p, sizeof(pl->name)); + STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); + } else if (strcmp(cmd, "dirrm") == 0) { + pl = calloc(1, sizeof(*pl)); + pl->type = PLIST_DIR_RM; + strncpy(pl->name, p, sizeof(pl->name)); + STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); + } else if (strcmp(cmd, "ignore") == 0) { + /* + * Apparently, "ignore" is similar to + * "comment" in that it can apply to + * the preceeding item. + */ + if (pl == NULL) + errx(1, "@ignore on non-plist"); + pl->flags |= PLIST_FLAG_IGNORE; + } else + warnx("Unknown command: '%s'", cmd); } else { pl = calloc(1, sizeof(*pl)); pl->type = PLIST_FILE; + strncpy(pl->name, line, sizeof(pl->name)); STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); } } - return (0); -error: - if (fp != NULL) - fclose(fp); - return (rval); } + +/* + * Debugging function - dump human-readable info on the given + * package. + */ +void +dump_package_info(struct pkg_metadata *pkg) +{ + struct pkg_plist *pl; + + printf("name:\t%s\n", pkg->name); + printf("origin:\t%s\n", pkg->origin); + printf("format:\t%s\n", pkg->pkg_format_revision); + printf("prefix:\t%s\n", pkg->prefix); + STAILQ_FOREACH(pl, &pkg->plist, linkage) { + printf("plist:\t%s\n", pl->name); + } +} From owner-p4-projects@FreeBSD.ORG Mon Jun 21 01:15:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AF921065672; Mon, 21 Jun 2010 01:15:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EAFA106566B; Mon, 21 Jun 2010 01:15:56 +0000 (UTC) (envelope-from ivoras@gmail.com) Received: from mail-ww0-f54.google.com (mail-ww0-f54.google.com [74.125.82.54]) by mx1.freebsd.org (Postfix) with ESMTP id 58C5F8FC14; Mon, 21 Jun 2010 01:15:54 +0000 (UTC) Received: by wwg30 with SMTP id 30so2921514wwg.13 for ; Sun, 20 Jun 2010 18:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:sender:received :in-reply-to:references:from:date:x-google-sender-auth:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=RBmipTLVcok7g3yZ054CVFjbctFfl1eO3d8eqQ6wGIo=; b=EDadMLqsAPUZUS+JvilR5if5Shppo8pqHygQ2keIl6756ng0W/hE6G+ZZ8Lpr5xrf/ uWpdK4T76StZnnO6wTD3mg7adc4Cz9gS7FHpXVAp0grwXkb2JofMR/QWiKyqoyW2Sad2 OWb4Q9yXbW5ITN/5dpTtw8gatpZuGeDUFfkM8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding; b=BZaEO0oJsn/Kq+SSsdlTQZAS8BgzHF0ifoALJzXB7IVmpkQblWAe5Qk1vaDKB+Z/WU MrljRYlx9Sia1Q3gpM7fMefcza18vNgTFr1KGq0XdhZ+Dm+fwtwoXAbH0z92B7f55hbE B4bNtMRILNDsHXQfXix5F4CNkHF0A4M/X/TZU= Received: by 10.216.88.72 with SMTP id z50mr2937412wee.60.1277082954200; Sun, 20 Jun 2010 18:15:54 -0700 (PDT) MIME-Version: 1.0 Sender: ivoras@gmail.com Received: by 10.216.89.197 with HTTP; Sun, 20 Jun 2010 18:15:34 -0700 (PDT) In-Reply-To: References: <201006210045.o5L0jgZ3009138@repoman.freebsd.org> From: Ivan Voras Date: Mon, 21 Jun 2010 03:15:34 +0200 X-Google-Sender-Auth: NCk4OSSFFdstiln1t7RP3R34pwI Message-ID: To: Julien LAFFAYE Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Andrew Pantyukhin , Perforce Change Reviews Subject: Re: PERFORCE change 180026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 01:15:56 -0000 On 21 June 2010 02:58, Julien LAFFAYE wrote: > Hi, > > On Sun, Jun 20, 2010 at 5:45 PM, Ivan Voras wrote: >> >> http://p4web.freebsd.org/@@180026?ac=3D10 >> >> Change 180026 by ivoras@betelgeuse on 2010/06/21 00:45:03 >> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0Finished most of +CONTENTS reading code, stil= l a few things to go >> =C2=A0 =C2=A0 =C2=A0 =C2=A0and certainly edge-cases resulting from the u= glyness and adhockery >> =C2=A0 =C2=A0 =C2=A0 =C2=A0of the format. >> > > Why don't you use read_plist(Package *pkg, int fd) from libpkg instead? Should I, in the light of YES_I_KNOW_THE_API_IS_RUBBISH_AND_IS_DOOMED_TO_CHANGE ? I thought the entire lib is to be rightfully scrapped and implemented as something decent. From owner-p4-projects@FreeBSD.ORG Mon Jun 21 01:23:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C26011065670; Mon, 21 Jun 2010 01:23:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87050106566C for ; Mon, 21 Jun 2010 01:23:47 +0000 (UTC) (envelope-from julien.laffaye@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 1451F8FC08 for ; Mon, 21 Jun 2010 01:23:46 +0000 (UTC) Received: by bwz8 with SMTP id 8so1344510bwz.13 for ; Sun, 20 Jun 2010 18:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=huR16ND571j0VbV/EG2hTfFb06+3NHKagLdjBLe13xM=; b=lNMp97MHkd9/awNXdOVvuGvmNKSUhPVFUA/LCn/psQhgT6yPMir54dvqL9mYLLjA1L 4hCEyoKQ2PyTwqfpCUQ5SuDWb1hfL2duWu/l16hkcbFcclBMaKVQi56Vl0LhedjOPwJe yoGd+lww5Bj+3Z64+WcegmOS4hekwqBG8j//8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=J0fwr9iVmnoWIuMTe/GsFl2B1e4bSqhfgXglTGajDDEbWoz4ET3qdBfYEaV4ycUb8F idasPlaf46a72tIi4zFobFWQr48c30tAzlOAygWxf3pHXR95os2En7TjK3x4/msHX4bO 3VZmFV0WTpy9F4THdO7DN3LXg6b7XFCUL2mG0= MIME-Version: 1.0 Received: by 10.204.141.28 with SMTP id k28mr2297552bku.207.1277081887133; Sun, 20 Jun 2010 17:58:07 -0700 (PDT) Sender: julien.laffaye@gmail.com Received: by 10.204.57.9 with HTTP; Sun, 20 Jun 2010 17:58:07 -0700 (PDT) In-Reply-To: <201006210045.o5L0jgZ3009138@repoman.freebsd.org> References: <201006210045.o5L0jgZ3009138@repoman.freebsd.org> Date: Sun, 20 Jun 2010 17:58:07 -0700 X-Google-Sender-Auth: 9INDWMpwPWFHFybdaMnhNfd5ojs Message-ID: From: Julien LAFFAYE To: Ivan Voras Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 180026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 01:23:48 -0000 Hi, On Sun, Jun 20, 2010 at 5:45 PM, Ivan Voras wrote: > > http://p4web.freebsd.org/@@180026?ac=3D10 > > Change 180026 by ivoras@betelgeuse on 2010/06/21 00:45:03 > > =A0 =A0 =A0 =A0Finished most of +CONTENTS reading code, still a few thing= s to go > =A0 =A0 =A0 =A0and certainly edge-cases resulting from the uglyness and a= dhockery > =A0 =A0 =A0 =A0of the format. > Why don't you use read_plist(Package *pkg, int fd) from libpkg instead? Regards, Julien From owner-p4-projects@FreeBSD.ORG Mon Jun 21 01:26:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22BC11065676; Mon, 21 Jun 2010 01:26:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DACB41065672; Mon, 21 Jun 2010 01:25:59 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 6F50D8FC14; Mon, 21 Jun 2010 01:25:59 +0000 (UTC) Received: by iwn7 with SMTP id 7so3677524iwn.13 for ; Sun, 20 Jun 2010 18:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=mJS8+GmG/+Ft+hfIVi71qzuPsrwX/cprgLS9Dcx657s=; b=ZLRwbbswr8m6a3h5ox/aXVPiluG9GNEq7gH+szUtp9XJtON6vegnySQ6F7CTaGBudn /f4LK/H6XoXDEJmeCfu5SWKGfq92QvlcnQInX+oVfW0rkVJxKSDOlNb2JNW5kq8vv8M6 VY4gsAxaeyzmKIE8HsRw9kZ8fItT2q3q500Y0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=XNVMqG3od3h2fI1iuCTqXUGJhbssq5etmPyAHYfB+AkI5XRzaM15+v/btar0kqZOL0 fKohmEmRP/M/mEMcFMHh4t9oGRDfgy2eF5xwVAptoHhEtBMVUb9M13W5drxO86+tHzKg AnIPVLa/0QHKLvvuoWa40Xc2XV2TbRDQhjJX8= MIME-Version: 1.0 Received: by 10.231.45.144 with SMTP id e16mr5093261ibf.130.1277083558836; Sun, 20 Jun 2010 18:25:58 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.117.201 with HTTP; Sun, 20 Jun 2010 18:25:58 -0700 (PDT) In-Reply-To: References: <201006210045.o5L0jgZ3009138@repoman.freebsd.org> Date: Sun, 20 Jun 2010 18:25:58 -0700 X-Google-Sender-Auth: NWDcvIXtOZt5lgsya3JBMKnJB1I Message-ID: From: Garrett Cooper To: Ivan Voras Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Andrew Pantyukhin , Perforce Change Reviews , Julien LAFFAYE Subject: Re: PERFORCE change 180026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 01:26:00 -0000 On Sun, Jun 20, 2010 at 6:15 PM, Ivan Voras wrote: > On 21 June 2010 02:58, Julien LAFFAYE wrote: >> Hi, >> >> On Sun, Jun 20, 2010 at 5:45 PM, Ivan Voras wrote: >>> >>> http://p4web.freebsd.org/@@180026?ac=3D10 >>> >>> Change 180026 by ivoras@betelgeuse on 2010/06/21 00:45:03 >>> >>> =A0 =A0 =A0 =A0Finished most of +CONTENTS reading code, still a few thi= ngs to go >>> =A0 =A0 =A0 =A0and certainly edge-cases resulting from the uglyness and= adhockery >>> =A0 =A0 =A0 =A0of the format. >>> >> >> Why don't you use read_plist(Package *pkg, int fd) from libpkg instead? > > Should I, in the light of > YES_I_KNOW_THE_API_IS_RUBBISH_AND_IS_DOOMED_TO_CHANGE ? I thought the > entire lib is to be rightfully scrapped and implemented as something > decent. Yes, it will be eventually, but there's no real harm in implementing this bit with read_plist for the time being though. If and when dforsyth's work gets straightened out, a lot of this crud will get scrapped and/or properly rewritten. Thanks, -Garrett From owner-p4-projects@FreeBSD.ORG Mon Jun 21 03:20:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ADA4106566C; Mon, 21 Jun 2010 03:20:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9AAC106564A for ; Mon, 21 Jun 2010 03:20:31 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A66478FC08 for ; Mon, 21 Jun 2010 03:20:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5L3KVE7034353 for ; Mon, 21 Jun 2010 03:20:31 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5L3KVv8034351 for perforce@freebsd.org; Mon, 21 Jun 2010 03:20:31 GMT (envelope-from ligregni@FreeBSD.org) Date: Mon, 21 Jun 2010 03:20:31 GMT Message-Id: <201006210320.o5L3KVv8034351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 03:20:32 -0000 http://p4web.freebsd.org/@@180027?ac=10 Change 180027 by ligregni@ligPhenom on 2010/06/21 03:19:59 Implemented MD5, the socket work file created, also included a Makefile to simplify development and using Affected files ... .. //depot/projects/soc2010/disaudit/Makefile#1 add .. //depot/projects/soc2010/disaudit/ideas.txt#4 edit .. //depot/projects/soc2010/disaudit/shipd.c#4 edit .. //depot/projects/soc2010/disaudit/shipd.h#4 edit .. //depot/projects/soc2010/disaudit/ssocket_work.c#1 add .. //depot/projects/soc2010/disaudit/ssocket_work.h#1 add Differences ... ==== //depot/projects/soc2010/disaudit/ideas.txt#4 (text+ko) ==== @@ -8,6 +8,7 @@ PARAMETERS (the main idea is to get them from /etc/security/audit_control) disaudit_type:master # none, master, slave, obviouslly depending on this to use the following parameters +disaudit_port:53686 /* SLAVE */ ==== //depot/projects/soc2010/disaudit/shipd.c#4 (text+ko) ==== @@ -28,6 +28,7 @@ /*** INCLUDES ***/ #include "shipd.h" +#include "ssocket_work.h" #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include /*** DECLARATIONS ***/ @@ -52,6 +54,9 @@ /* Two main things to be set by this variable, if daemonize or not, and the destination of the messages */ int debug; +/* Port number */ +int port_number; + main (int argc, char *argv[]) { char cl_opt; @@ -118,6 +123,7 @@ fscanf(fpars, "%s", master_host); fscanf(fpars, "%d", &panic_level); fscanf(fpars, "%d", &msec_freq); + fscanf(fpars, "%d", &port_number); return 0; } @@ -131,6 +137,10 @@ syslog(LOG_ERR, "%s", message); } +/* + * Look for the last closed trail and + * send it + */ void do_last() { @@ -153,6 +163,11 @@ } } +/* + * Used by do_last() function, this get the last + * closed trail in meaning of lexicographic + * order (that is also a chronological one) + */ int get_last_trail(char *path) { @@ -206,6 +221,12 @@ return 0; } +/* + * When exploring /var/audit/ (or the directory + * where the trails are), not all files are trails + * so we must ensure we will only deal with the ones + * that are trails + */ int is_audit_trail(char *path) { @@ -324,8 +345,11 @@ qsort(trail_paths, n_elements, sizeof(*trail_paths), cmp_trails); for (i=0; id_name) ) /* It's not other file */ - if ( !is_in_master(dirp->d_name) ) + if ( !is_in_master(dirp->d_name, fullpath) ) if (send_trail(fullpath) == -1) { sprintf(message, "ERROR Sending \"%s\" to %s", fullpath, master_host); ==== //depot/projects/soc2010/disaudit/shipd.h#4 (text+ko) ==== @@ -44,7 +44,7 @@ int send_trail(char *); void do_daemon_date(); int cmp_trails(const void *, const void *); -int is_in_master(char *); +int is_in_master(char *, char *); void do_daemon_all(); From owner-p4-projects@FreeBSD.ORG Mon Jun 21 08:17:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CE29106566C; Mon, 21 Jun 2010 08:17:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CF411065670 for ; Mon, 21 Jun 2010 08:17:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 386848FC0C for ; Mon, 21 Jun 2010 08:17:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5L8H4vU072035 for ; Mon, 21 Jun 2010 08:17:04 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5L8GupM072017 for perforce@freebsd.org; Mon, 21 Jun 2010 08:16:56 GMT (envelope-from trasz@freebsd.org) Date: Mon, 21 Jun 2010 08:16:56 GMT Message-Id: <201006210816.o5L8GupM072017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180030 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 08:17:04 -0000 http://p4web.freebsd.org/@@180030?ac=10 Change 180030 by trasz@trasz_victim on 2010/06/21 08:16:45 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#11 integrate .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#19 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#23 integrate .. //depot/projects/soc2009/trasz_limits/bin/chio/chio.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/cp/cp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/date/date.1#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/pax/pat_rep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/pkill/pkill.1#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/pkill/pkill.c#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.1#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#10 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/expand.c#8 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/histedit.c#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/jobs.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/main.c#9 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/myhistedit.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#11 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#11 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.c#8 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.h#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#5 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/CHANGES#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/version#8 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/archures.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/bfd-in2.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/cpu-mips.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/elfxx-mips.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/gas/config/tc-mips.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/include/elf/mips.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/include/opcode/mips.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/opcodes/mips-dis.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/opcodes/mips-opc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/opcodes/mips16-opc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/snmpd/snmpmod.3#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/fixdfdi.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/fixsfdi.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/fixunsdfsi.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/fixunssfsi.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/floatdidf.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/floatdisf.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/floatundidf.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/floatundisf.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/mips/freebsd.h#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/mips/mips.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/mips/mips.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/mips/mips.md#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/CREDITS.TXT#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/LICENSE.TXT#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile.common#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile.config.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile.rules#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/ModuleInfo.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/README.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/AutoRegen.sh#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/ExportMap.map#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/LICENSE.TXT#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/README.TXT#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/config.guess#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/config.sub#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/configure.ac#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/depcomp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/install-sh#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/ltmain.sh#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/bison.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/build_exeext.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/c_printf_a.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/check_gnu_make.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/config_makefile.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/config_project.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_bidi_iterator.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_flag_check.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_fwd_iterator.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_namespaces.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_std_iterator.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/find_std_program.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/flex.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/func_isinf.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/func_isnan.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/func_mmap_file.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/header_mmap_anonymous.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/huge_val.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/libtool.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/link_options.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/linux_mixed_64_32.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/ltdl.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/need_dev_zero_for_mmap.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/path_perl.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/path_tclsh.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/rand48.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/sanity_check.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/single_cxx_check.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/visibility_inlines_hidden.m4#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/missing#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/mkinstalldirs#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/README.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/analysis/llvm_analysis-binding.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/analysis/llvm_analysis.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/analysis/llvm_analysis_wrap.cxx#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader-binding.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitreader/llvm_bitreader_wrap.cxx#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer-binding.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitwriter/llvm_bitwriter_wrap.cxx#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine-binding.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/executionengine/llvm_executionengine_wrap.cxx#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm.gpr#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm-binding.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer-binding.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm_linktimeoptimizer_wrap.cxx#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm_wrap.cxx#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/target/llvm_target-binding.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/target/llvm_target.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/target/llvm_target_wrap.cxx#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/transforms/llvm_transforms-binding.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/transforms/llvm_transforms.ads#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/transforms/llvm_transforms_wrap.cxx#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/Makefile.ocaml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/analysis/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/analysis/analysis_ocaml.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.ml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.mli#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitreader/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitreader/bitreader_ocaml.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.ml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.mli#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitwriter/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitwriter/bitwriter_ocaml.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.ml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.mli#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/executionengine/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.ml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.mli#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/llvm/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/llvm/llvm.ml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/llvm/llvm.mli#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/llvm/llvm_ocaml.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/target/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/target/llvm_target.ml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/target/llvm_target.mli#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/target/target_ocaml.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/scalar/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.ml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.mli#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/scalar/scalar_opts_ocaml.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/build-for-llvm-top.sh#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/configure#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Analysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/BitReader.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/BitWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Core.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/EnhancedDisassembly.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/ExecutionEngine.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Target.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Transforms/IPO.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Transforms/Scalar.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/lto.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/APFloat.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/APInt.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/APSInt.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/BitVector.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DeltaAlgorithm.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DenseMap.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DenseMapInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DenseSet.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DepthFirstIterator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/FoldingSet.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/GraphTraits.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ImmutableList.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ImmutableMap.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ImmutableSet.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/IndexedMap.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Optional.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/OwningPtr.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/PointerIntPair.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/PointerUnion.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/PostOrderIterator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/PriorityQueue.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SCCIterator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/STLExtras.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ScopedHashTable.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SetOperations.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SetVector.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallBitVector.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallPtrSet.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallSet.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallString.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallVector.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SparseBitVector.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Statistic.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringExtras.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringMap.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringRef.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringSet.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringSwitch.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Trie.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Triple.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Twine.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/UniqueVector.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ValueMap.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/VectorExtras.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ilist.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ilist_node.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/iterator.cmake#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/iterator.h.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/AbstractTypeUser.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/CFGPrinter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/CallGraph.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/CaptureTracking.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ConstantFolding.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ConstantsScanner.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DebugInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DomPrinter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DominatorInternals.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Dominators.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/IVUsers.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/InlineCost.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Interval.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/IntervalIterator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/IntervalPartition.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Lint.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LiveValues.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LoopInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LoopPass.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/PHITransAddr.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Passes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/PointerTracking.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/PostDominators.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ProfileInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ProfileInfoLoader.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ProfileInfoTypes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolutionNormalization.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/SparsePropagation.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Trace.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ValueTracking.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Verifier.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Argument.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Assembly/AsmAnnotationWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Assembly/Parser.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Assembly/PrintModulePass.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Assembly/Writer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Attributes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/AutoUpgrade.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/BasicBlock.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/Archive.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/BitCodes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CallGraphSCCPass.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CallingConv.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/Analysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/BinaryObject.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/FastISel.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/GCMetadata.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/GCMetadataPrinter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/GCStrategy.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/GCs.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/IntrinsicLowering.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LatencyPriorityQueue.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LinkAllAsmWriterComponents.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveVariables.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachORelocation.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineCodeInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineDominators.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineJumpTableInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineLocation.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineModuleInfoImpls.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachinePassRegistry.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineRelocation.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineSSAUpdater.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ObjectCodeEmitter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/Passes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/PseudoSourceValue.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RegAllocRegistry.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ScheduleHazardRecognizer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SchedulerRegistry.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ValueTypes.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Action.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/BuiltinOptions.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Common.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Error.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/ForceLinkage.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/ForceLinkageMacros.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Main.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Plugin.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Tool.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/AsmParsers.def.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/AsmPrinters.def.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/Disassemblers.def.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/Targets.def.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/config.h.cmake#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/config.h.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Constant.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Constants.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/DerivedTypes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/GenericValue.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/Interpreter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/JIT.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Function.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GVMaterializer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GlobalAlias.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GlobalValue.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GlobalVariable.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/InlineAsm.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/InstrTypes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Instruction.def#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Instruction.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Instructions.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicInst.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Intrinsics.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Intrinsics.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsARM.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsAlpha.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsCellSPU.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsPowerPC.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsX86.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsXCore.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LLVMContext.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LinkAllPasses.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LinkAllVMCore.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Linker.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/EDInstInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAsmInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAsmInfoCOFF.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAsmInfoDarwin.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAsmLayout.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAssembler.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCCodeEmitter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCContext.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCDirectives.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCDisassembler.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCExpr.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCFixup.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCInst.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCInstPrinter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCLabel.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCMachOSymbolFlags.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCObjectWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/AsmCond.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/AsmParser.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSection.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSectionCOFF.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSectionELF.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSectionMachO.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCStreamer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSymbol.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCValue.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MachObjectWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/SectionKind.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Metadata.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Module.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/OperandTraits.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Operator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Pass.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassAnalysisSupport.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassManager.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassManagers.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassSupport.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/AlignOf.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Allocator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CFG.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CallSite.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Casting.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CommandLine.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Compiler.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ConstantFolder.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ConstantRange.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DOTGraphTraits.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DataFlow.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DataTypes.h.cmake#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DataTypes.h.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Debug.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DebugLoc.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Dwarf.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DynamicLinker.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ELF.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ErrorHandling.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/FileUtilities.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Format.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/FormattedStream.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/GetElementPtrTypeIterator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/GraphWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/IRBuilder.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/IRReader.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/InstIterator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/InstVisitor.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/LeakDetector.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MachO.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ManagedStatic.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MathExtras.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MemoryBuffer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MemoryObject.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MutexGuard.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/NoFolder.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/OutputBuffer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PassNameParser.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PatternMatch.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PluginLoader.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PointerLikeTypeTraits.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PredIteratorCache.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PrettyStackTrace.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Recycler.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/RecyclingAllocator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Regex.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Registry.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/RegistryParser.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/SMLoc.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/SlowOperationInformer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/SourceMgr.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/StableBasicBlockNumbering.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/StandardPasses.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/StringPool.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/SystemUtils.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/TargetFolder.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Timer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/TypeBuilder.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ValueHandle.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/circular_raw_ostream.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/raw_os_ostream.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/raw_ostream.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/type_traits.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/SymbolTableListTraits.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/AIXDataTypesFix.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Alarm.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Atomic.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/DataTypes.h.cmake#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/DataTypes.h.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Disassembler.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/DynamicLibrary.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Errno.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Host.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/IncludeFile.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/LICENSE.TXT#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Memory.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Mutex.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Path.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Process.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Program.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/RWMutex.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Signals.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Solaris.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/ThreadLocal.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Threading.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/TimeValue.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Valgrind.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/Mangler.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/SubtargetFeature.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/Target.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetAsmBackend.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetAsmLexer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetAsmParser.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetCallingConv.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetData.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetFrameInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetIntrinsicInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetJITInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetLowering.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetMachine.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetOpcodes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetOptions.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetRegistry.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSchedule.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSelect.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSelectionDAGInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSubtarget.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/IPO.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Instrumentation.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/RSProfiling.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Scalar.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/AddrModeMatcher.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/BasicInliner.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/FunctionUtils.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/Local.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/PromoteMemToReg.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdaterImpl.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/SSI.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/UnrollLoop.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Type.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/TypeSymbolTable.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Use.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/User.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Value.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ValueSymbolTable.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasDebugger.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasSetTracker.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Analysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/CFGPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/CaptureTracking.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ConstantFolding.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DebugInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DomPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IVUsers.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InlineCost.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InstCount.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Interval.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IntervalPartition.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LazyValueInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LibCallSemantics.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Lint.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LiveValues.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LoopInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LoopPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/PHITransAddr.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/PointerTracking.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/PostDominators.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileInfoLoader.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/README.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/SparsePropagation.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Trace.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ValueTracking.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/Archive.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/ArchiveInternals.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/ArchiveReader.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/ArchiveWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLLexer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLLexer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLParser.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLParser.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLToken.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/Parser.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/BitWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Analysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AntiDepBreaker.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/BranchFolding.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/BranchFolding.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELF.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/GCMetadata.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/GCMetadataPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/GCStrategy.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/IfConversion.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveInterval.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveVariables.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LowerSubregs.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineCSE.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineDominators.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineFunction.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineFunctionPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineInstr.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineLICM.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachinePassRegistry.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineSSAUpdater.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineSink.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ObjectCodeEmitter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/OcamlGC.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/OptimizeExts.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/Graph.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/HeuristicBase.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/HeuristicSolver.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/Heuristics/Briggs.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/Math.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/Solution.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PHIElimination.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PHIElimination.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Passes.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PseudoSourceValue.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/README.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocLocal.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/CallingConvLower.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeOrdering.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/TargetSelectionDAGInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SimpleHazardRecognizer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SlotIndexes.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Spiller.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Spiller.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StackProtector.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TailDuplication.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/VirtRegMap.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/VirtRegMap.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/VirtRegRewriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Action.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/BuiltinOptions.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/CompilationGraph.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Main.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Plugin.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Tool.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/LinkArchives.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/LinkItems.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/LinkModules.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/Linker.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAsmInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAsmStreamer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAssembler.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCCodeEmitter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCContext.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCExpr.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCInst.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCInstPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCLabel.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCLoggingStreamer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCMachOStreamer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCNullStreamer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCObjectWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCSection.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCSectionCOFF.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCSectionELF.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCSectionMachO.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCStreamer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCSymbol.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCValue.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MachObjectWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/TargetAsmBackend.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/APFloat.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/APInt.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/APSInt.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Allocator.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/COPYRIGHT.regex#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/CommandLine.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/ConstantRange.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Debug.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/DeltaAlgorithm.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Dwarf.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/ErrorHandling.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/FileUtilities.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/FoldingSet.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/FormattedStream.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/GraphWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/IsInf.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/IsNAN.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/ManagedStatic.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/MemoryBuffer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/MemoryObject.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/PluginLoader.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/PrettyStackTrace.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Regex.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SlowOperationInformer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SmallPtrSet.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SmallVector.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SourceMgr.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Statistic.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/StringExtras.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/StringMap.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/StringPool.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/StringRef.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SystemUtils.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/TargetRegistry.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Timer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Triple.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Twine.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/circular_raw_ostream.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/raw_os_ostream.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/raw_ostream.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regcclass.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regcname.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regcomp.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regengine.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regerror.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regex2.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regex_impl.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regexec.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regfree.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regstrlcpy.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/regutils.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Alarm.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Atomic.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/CMakeLists.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Disassembler.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/DynamicLibrary.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Errno.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Host.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/IncludeFile.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Memory.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Mutex.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Path.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Process.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Program.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/README.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/RWMutex.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/SearchForAddressOfSpecialSymbol.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Signals.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/ThreadLocal.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Threading.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/TimeValue.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Alarm.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Host.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Memory.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Mutex.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Path.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Process.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Program.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/README.txt#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/RWMutex.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Signals.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/ThreadLocal.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/TimeValue.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Unix.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Valgrind.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Alarm.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/DynamicLibrary.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Host.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Memory.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Mutex.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Path.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Process.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Program.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/RWMutex.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Signals.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/ThreadLocal.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/TimeValue.inc#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Win32.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARM.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARM.td#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 21 08:27:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C00DC106566B; Mon, 21 Jun 2010 08:27:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 845DA106566C for ; Mon, 21 Jun 2010 08:27:15 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 719FF8FC1A for ; Mon, 21 Jun 2010 08:27:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5L8RFU2072818 for ; Mon, 21 Jun 2010 08:27:15 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5L8RFDi072816 for perforce@freebsd.org; Mon, 21 Jun 2010 08:27:15 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 21 Jun 2010 08:27:15 GMT Message-Id: <201006210827.o5L8RFDi072816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 08:27:16 -0000 http://p4web.freebsd.org/@@180031?ac=10 Change 180031 by ilya@ilya_triton on 2010/06/21 08:26:19 Embed fnnode reference to vnode Add reclaim hook Remove vp hash, use only inode hash table Extend node_lookupex to ignore invalid node reference and optionally lock vnode Fix vnode locking in hook_rename Affected files ... .. //depot/projects/soc2010/ilya_fsnotify/src/sys/kern/vfs_notify.c#4 edit .. //depot/projects/soc2010/ilya_fsnotify/src/sys/kern/vfs_subr.c#3 edit .. //depot/projects/soc2010/ilya_fsnotify/src/sys/sys/fsnotify.h#4 edit .. //depot/projects/soc2010/ilya_fsnotify/src/sys/sys/vnode.h#2 edit Differences ... ==== //depot/projects/soc2010/ilya_fsnotify/src/sys/kern/vfs_notify.c#4 (text+ko) ==== @@ -123,8 +123,7 @@ static struct task fsnotify_task; static struct taskqueue *fsnotify_tq; -static struct fnnode_hashhead **fnnode_vphashtbl; -static struct fnnode_hashhead **fnnode_inohashtbl; +static struct fnnode_hashhead *fnnode_inohashtbl; static struct mtx fnnode_hashmtx; static u_long fnnode_hashmask; @@ -142,6 +141,7 @@ .d_name = "fsnotify", }; +static void hook_reclaim(struct vnode *vp); static vop_create_t hook_create; static vop_link_t hook_link; static vop_mkdir_t hook_mkdir; @@ -160,13 +160,18 @@ static int session_rmwatch(struct fnsession *ss, int wd); static struct fnnode* node_lookup(struct vnode *vp); static struct fnnode* node_lookupex(struct vnode *vp, ino_t *inop, - int vplocked); + int flags); static struct fnnode* node_alloc(struct vnode *vp, ino_t ino); -static void node_destroy(struct fnnode *node); +static void node_drop(struct fnnode *node); static void event_copypath(struct fnevent *event, char *path, int *pathlen); static int event_pathlen(struct fnevent *event); static int event_nextcookie(void); +#define NODE_ISVALID(a) ((a) != NULL && (a) != FNNODE_INVAL) + +#define LOOKUP_VPLOCKED 0x0001 +#define LOOKUP_IGNINVAL 0x0002 + static int fsnotify_modevent(struct module *module, int cmd, void *arg) { @@ -175,7 +180,8 @@ switch (cmd) { case MOD_LOAD: - if (fsnotify_hook_create != NULL || + if (fsnotify_hook_reclaim != NULL || + fsnotify_hook_create != NULL || fsnotify_hook_link != NULL || fsnotify_hook_mkdir != NULL || fsnotify_hook_remove != NULL || @@ -190,8 +196,6 @@ mtx_init(&fnnode_hashmtx, "fsnotify_hash", NULL, MTX_DEF); hashsize = MAX(desiredvnodes / 32, 16); - fnnode_vphashtbl = hashinit(hashsize, M_FSNOTIFYHASH, - &fnnode_hashmask); fnnode_inohashtbl = hashinit(hashsize, M_FSNOTIFYHASH, &fnnode_hashmask); @@ -205,6 +209,7 @@ fsnotify_dev = make_dev(&fsnotify_cdevsw, 0, UID_ROOT, GID_WHEEL, 0666, "fsnotify"); + fsnotify_hook_reclaim = hook_reclaim; fsnotify_hook_create = hook_create; fsnotify_hook_link = hook_link; fsnotify_hook_mkdir = hook_mkdir; @@ -214,6 +219,7 @@ fsnotify_hook_symlink = hook_symlink; break; case MOD_UNLOAD: + fsnotify_hook_reclaim = NULL; fsnotify_hook_create = NULL; fsnotify_hook_link = NULL; fsnotify_hook_mkdir = NULL; @@ -224,7 +230,6 @@ destroy_dev(fsnotify_dev); taskqueue_drain(fsnotify_tq, &fsnotify_task); taskqueue_free(fsnotify_tq); - free(fnnode_vphashtbl, M_FSNOTIFYHASH); free(fnnode_inohashtbl, M_FSNOTIFYHASH); mtx_destroy(&fsnotify_queue_mtx); mtx_destroy(&fnnode_hashmtx); @@ -279,6 +284,8 @@ mtx_init(&ss->ss_mtx, "fnsession_queue", NULL, MTX_DEF); cv_init(&ss->ss_queuecv, "fnsession_queuecv"); + TAILQ_INIT(&ss->ss_queue); + TAILQ_INIT(&ss->ss_watchlist); devfs_set_cdevpriv(ss, fsnotify_session_dtor); @@ -353,7 +360,6 @@ { struct fnsession *ss; struct fnnode *node; - struct fnnode *freenode; struct fnevent *event; struct fnwatch *watch; struct fsnotify_addwatch_args *add_args; @@ -383,10 +389,9 @@ if (vp == NULL) return (EBADF); vfslocked = VFS_LOCK_GIANT(vp->v_mount); - node = node_lookupex(vp, &ino, 0); + node = node_lookupex(vp, &ino, LOOKUP_IGNINVAL); if (node != NULL) { VFS_UNLOCK_GIANT(vfslocked); - freenode = NULL; } else { error = vn_fullpath(td, vp, &path, &pathfree); VFS_UNLOCK_GIANT(vfslocked); @@ -396,14 +401,11 @@ node->nd_path = path; node->nd_pathlen = strlen(path); node->nd_pathfree = pathfree; - freenode = node; } error = session_addwatch(ss, node, add_args->fa_mask, &watch); - if (error == 0) { + if (error == 0) add_args->fa_wd = watch->wt_wd; - } else if (freenode != NULL) { - node_destroy(node); - } + /* If error != 0 node will be removed by hook_reclaim */ break; case FSNOTIFY_RMWATCH: error = session_rmwatch(ss, *(int *)data); @@ -453,6 +455,20 @@ /* * VFS hooks */ +static void +hook_reclaim(struct vnode *vp) +{ + struct fnnode *node; + + VI_LOCK(vp); + node = vp->v_fnnode; + vp->v_fnnode = NULL; + VI_UNLOCK(vp); + + if (NODE_ISVALID(node)) + node_drop(node); +} + static __inline int hook_generic_create(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) @@ -533,7 +549,7 @@ cookie = event_nextcookie(); if (ap->a_tvp != NULL) { - tnode = node_lookup(ap->a_tvp); + tnode = node_lookupex(ap->a_tvp, NULL, 0); if (tnode != NULL) { enqueue_fileevent(tnode, cookie, FE_DESTROY | FE_REMOVE); @@ -548,7 +564,7 @@ fdirnode = node_lookupex(ap->a_fdvp, NULL, 0); if (fdirnode != NULL) enqueue_direvent(fdirnode, ap->a_fcnp, cookie, FE_RENAME_FROM); - tdirnode = node_lookup(ap->a_tdvp); + tdirnode = node_lookupex(ap->a_tdvp, NULL, 0); if (tdirnode != NULL) enqueue_direvent(tdirnode, ap->a_tcnp, cookie, FE_RENAME_TO); @@ -591,6 +607,11 @@ if (refcount_release(&node->nd_refcnt) != 0) { KASSERT(node->nd_watchcount == 0 && node->nd_supermask == 0 && TAILQ_EMPTY(&node->nd_watchlist), ("Invalid reference count")); + if (node->nd_ino != 0) { + mtx_lock(&fnnode_hashmtx); + LIST_REMOVE(node, nd_hashentry); + mtx_unlock(&fnnode_hashmtx); + } mtx_destroy(&node->nd_mtx); free(node->nd_path, M_TEMP); free(node, M_FSNOTIFY); @@ -598,22 +619,12 @@ } static __inline struct fnnode_hashhead * -node_vphashhead(struct vnode *vp) -{ - uint32_t h; - - h = hash32_buf(vp, sizeof(vp), HASHINIT); - h += vp->v_mount->mnt_hashseed; - return fnnode_vphashtbl[h & fnnode_hashmask]; -} - -static __inline struct fnnode_hashhead * node_inohashhead(struct mount *mnt, ino_t ino) { uint32_t h; h = ino + mnt->mnt_hashseed; - return fnnode_inohashtbl[h & fnnode_hashmask]; + return &fnnode_inohashtbl[h & fnnode_hashmask]; } static struct fnnode * @@ -622,21 +633,19 @@ struct fnnode *node; MPASS(vp != NULL); + MPASS(ino != 0); node = malloc(sizeof(struct fnnode), M_FSNOTIFY, M_WAITOK | M_ZERO); refcount_init(&node->nd_refcnt, 1); + mtx_init(&node->nd_mtx, "fsnotify_node", NULL, MTX_DEF); + TAILQ_INIT(&node->nd_watchlist); + + node->nd_ino = ino; - mtx_lock(&fnnode_hashmtx); - /* DEBUG */ - LIST_FOREACH(node, node_vphashhead(vp), nd_hashentry) { - if (node->nd_vnode == vp) { - panic("Node already exists in vnode hash table: %p", - node->nd_vnode); - } - } - LIST_INSERT_HEAD(node_vphashhead(vp), node, nd_hashentry); - mtx_unlock(&fnnode_hashmtx); + VI_LOCK(vp); + vp->v_fnnode = node; + VI_UNLOCK(vp); return (node); } @@ -657,18 +666,6 @@ } } -static void -node_destroy(struct fnnode *node) -{ - mtx_lock(&node->nd_mtx); - node_detachwatches(node); - mtx_unlock(&node->nd_mtx); - mtx_lock(&fnnode_hashmtx); - LIST_REMOVE(node, nd_hashentry); - mtx_unlock(&fnnode_hashmtx); - node_drop(node); -} - static int node_getino(struct vnode *vp, ino_t *inop, int vplocked) { @@ -681,7 +678,10 @@ return (error); } - error = VOP_GETATTR(vp, &va, thread0.td_ucred); + if (vp->v_iflag & VI_DOOMED) + return (EINVAL); + + error = VOP_GETATTR(vp, &va, NOCRED); if (error == 0) *inop = va.va_fileid; @@ -692,51 +692,66 @@ } static struct fnnode* -node_lookupex(struct vnode *vp, ino_t *inop, int vplocked) +node_lookupex(struct vnode *vp, ino_t *inop, int flags) { struct fnnode *node, *rv; ino_t ino; - int error; + int error, watchcount; rv = NULL; - /* Node is always on one of the hash tables. */ - mtx_lock(&fnnode_hashmtx); - LIST_FOREACH(node, node_vphashhead(vp), nd_hashentry) { - if (node->nd_vnode == vp) { - mtx_lock(&node->nd_mtx); - rv = (node->nd_watchcount == 0 ? NULL : node); - if (rv == NULL) - mtx_unlock(&node->nd_mtx); - break; - } + VI_LOCK(vp); + node = vp->v_fnnode; + VI_UNLOCK(vp); + if (node == FNNODE_INVAL) { + node = NULL; + if ((flags & LOOKUP_IGNINVAL) == 0) + goto done; + } else if (node != NULL) { + mtx_lock(&node->nd_mtx); + watchcount = node->nd_watchcount; + mtx_unlock(&node->nd_mtx); + if (watchcount == 0) + node = NULL; + goto done; } - mtx_unlock(&fnnode_hashmtx); - if (node == NULL) { - if (inop == NULL) - inop = &ino; - error = node_getino(vp, inop, vplocked); - if (error != 0) - goto done; + node = NULL; + if (inop == NULL) + inop = &ino; + error = node_getino(vp, inop, flags & LOOKUP_VPLOCKED); + if (error != 0) + goto done; - mtx_lock(&fnnode_hashmtx); - LIST_FOREACH(node, - node_inohashhead(vp->v_mount, *inop), nd_hashentry) { - if (node->nd_ino != *inop || - node->nd_mount != vp->v_mount) - continue; - /* add to inohash */ - mtx_lock(&node->nd_mtx); - rv = (node->nd_watchcount == 0 ? NULL : node); - if (rv == NULL) - mtx_unlock(&node->nd_mtx); - break; - } + mtx_lock(&fnnode_hashmtx); + LIST_FOREACH(node, + node_inohashhead(vp->v_mount, *inop), nd_hashentry) { + if (node->nd_ino != *inop || + node->nd_mount != vp->v_mount) + continue; + mtx_lock(&node->nd_mtx); + VI_LOCK(vp); + if (!NODE_ISVALID(vp->v_fnnode)) { + node_hold(node); + vp->v_fnnode = node; + } else + MPASS(vp->v_fnnode == node); + VI_UNLOCK(vp); + watchcount = node->nd_watchcount; + mtx_unlock(&node->nd_mtx); + if (watchcount == 0) + node = NULL; mtx_unlock(&fnnode_hashmtx); + goto done; } + mtx_unlock(&fnnode_hashmtx); + VI_LOCK(vp); + if (!NODE_ISVALID(vp->v_fnnode)) + vp->v_fnnode = FNNODE_INVAL; + VI_UNLOCK(vp); + done: - return (rv); + return (node); } static __inline struct fnnode* @@ -744,7 +759,7 @@ { ASSERT_VOP_LOCKED(vp, "fsnotify node lookup"); - return (node_lookupex(vp, NULL, 1)); + return (node_lookupex(vp, NULL, LOOKUP_VPLOCKED)); } static int ==== //depot/projects/soc2010/ilya_fsnotify/src/sys/kern/vfs_subr.c#3 (text+ko) ==== @@ -275,6 +275,8 @@ /* * fsnotify hooks */ + +void (*fsnotify_hook_reclaim)(struct vnode *vp) = NULL; vop_create_t *fsnotify_hook_create = NULL; vop_link_t *fsnotify_hook_link = NULL; vop_mkdir_t *fsnotify_hook_mkdir = NULL; @@ -2598,6 +2600,8 @@ */ delmntque(vp); cache_purge(vp); + if (fsnotify_hook_reclaim != NULL) + fsnotify_hook_reclaim(vp); /* * Done with purge, reset to the standard lock and invalidate * the vnode. ==== //depot/projects/soc2010/ilya_fsnotify/src/sys/sys/fsnotify.h#4 (text+ko) ==== @@ -27,22 +27,22 @@ * $FreeBSD$ */ -#ifndef _SYS_FSNOTIFY_H_ +#ifndef _SYS_FSNOTIFY_H_ #define _SYS_FSNOTIFY_H_ -#define FE_CREATE 0x0001 -#define FE_REMOVE 0x0002 -#define FE_RENAME_FROM 0x0004 -#define FE_RENAME_TO 0x0008 +#define FE_CREATE 0x0001 +#define FE_REMOVE 0x0002 +#define FE_RENAME_FROM 0x0004 +#define FE_RENAME_TO 0x0008 -#define FE_CLOSE 0x0010 -#define FE_INACTIVE 0x0020 -#define FE_INACTIVE_CHANGED 0x0040 +#define FE_CLOSE 0x0010 +#define FE_INACTIVE 0x0020 +#define FE_INACTIVE_CHANGED 0x0040 -#define FE_DESTROY 0x0080 +#define FE_DESTROY 0x0080 -#define FSNOTIFY_ADDWATCH _IOWR('F', 1, struct fsnotify_addwatch_args) -#define FSNOTIFY_RMWATCH _IOW('F', 2, int) +#define FSNOTIFY_ADDWATCH _IOWR('F', 1, struct fsnotify_addwatch_args) +#define FSNOTIFY_RMWATCH _IOW('F', 2, int) struct fsnotify_event { int32_t fe_wd; @@ -61,6 +61,10 @@ #ifdef _KERNEL +#define FNNODE_INVAL ((void *)(uintptr_t)(-1)) + +extern void (*fsnotify_hook_reclaim)(struct vnode *vp); + extern vop_create_t *fsnotify_hook_create; extern vop_link_t *fsnotify_hook_link; extern vop_mkdir_t *fsnotify_hook_mkdir; @@ -69,7 +73,7 @@ extern vop_rmdir_t *fsnotify_hook_rmdir; extern vop_symlink_t *fsnotify_hook_symlink; -#endif /* _KERNEL */ +#endif /* _KERNEL */ -#endif /* !_SYS_FSNOTIFY_H_ */ +#endif /* !_SYS_FSNOTIFY_H_ */ ==== //depot/projects/soc2010/ilya_fsnotify/src/sys/sys/vnode.h#2 (text+ko) ==== @@ -60,6 +60,7 @@ * it from v_data. If non-null, this area is freed in getnewvnode(). */ +struct fnnode; struct namecache; struct vpollinfo { @@ -169,6 +170,7 @@ struct vpollinfo *v_pollinfo; /* G Poll events, p for *v_pi */ struct label *v_label; /* MAC label for vnode */ struct lockf *v_lockf; /* Byte-level lock list */ + struct fnnode *v_fnnode; /* i fsnotify node */ }; #endif /* defined(_KERNEL) || defined(_KVM_VNODE) */ From owner-p4-projects@FreeBSD.ORG Mon Jun 21 12:44:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EE41106566B; Mon, 21 Jun 2010 12:44:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 613911065674 for ; Mon, 21 Jun 2010 12:44:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F03A8FC21 for ; Mon, 21 Jun 2010 12:44:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LCivqP006891 for ; Mon, 21 Jun 2010 12:44:57 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LCivEb006889 for perforce@freebsd.org; Mon, 21 Jun 2010 12:44:57 GMT (envelope-from trasz@freebsd.org) Date: Mon, 21 Jun 2010 12:44:57 GMT Message-Id: <201006211244.o5LCivEb006889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180035 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 12:44:58 -0000 http://p4web.freebsd.org/@@180035?ac=10 Change 180035 by trasz@trasz_victim on 2010/06/21 12:44:11 Fix mismerge. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#31 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#31 (text+ko) ==== @@ -83,7 +83,6 @@ static int donice(struct thread *td, struct proc *chgp, int n); static struct uidinfo *uilookup(uid_t uid); static void ruxagg_locked(struct rusage_ext *rux, struct thread *td); -static void ruxagg(struct proc *p, struct thread *td); static struct gidinfo *gilookup(gid_t gid); /* From owner-p4-projects@FreeBSD.ORG Mon Jun 21 15:58:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90F6D106566B; Mon, 21 Jun 2010 15:58:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 474FE1065675 for ; Mon, 21 Jun 2010 15:58:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 352D48FC1D for ; Mon, 21 Jun 2010 15:58:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LFwTiU035804 for ; Mon, 21 Jun 2010 15:58:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LFwTtx035802 for perforce@freebsd.org; Mon, 21 Jun 2010 15:58:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 21 Jun 2010 15:58:29 GMT Message-Id: <201006211558.o5LFwTtx035802@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180040 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 15:58:29 -0000 http://p4web.freebsd.org/@@180040?ac=10 Change 180040 by hselasky@hselasky_laptop001 on 2010/06/21 15:58:03 USB controller: - integrate some fixes - remove unused file http://svn.freebsd.org/viewvc/base/user/jmallett/octeon/sys/mips/cavium/usb/octusb.c Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/octusb_mips.c#3 delete Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#3 (text+ko) ==== @@ -334,7 +334,7 @@ if (td->remainder > rem) { td->error_any = 1; - DPRINTF(1, "Excess setup transmit data\n"); + DPRINTFN(1, "Excess setup transmit data\n"); return (0); /* done */ } usbd_copy_out(td->pc, td->offset, td->qh->fixup_buf + td->qh->fixup_off, td->remainder); @@ -371,7 +371,7 @@ td->remainder -= rem; td->qh->fixup_off += rem; - return (1); /* done */ + return (0); /* done */ } static uint8_t @@ -459,7 +459,7 @@ if (rem == 0) { /* should not happen */ - DPRINTF(1, "Fixup buffer is too small\n"); + DPRINTFN(1, "Fixup buffer is too small\n"); td->error_any = 1; return (0); /* done */ } @@ -587,7 +587,7 @@ if (rem == 0) { /* should not happen */ - DPRINTF(1, "Fixup buffer is too small\n"); + DPRINTFN(1, "Fixup buffer is too small\n"); td->error_any = 1; return (0); /* done */ } @@ -864,6 +864,9 @@ if (sc->sc_noport > OCTUSB_MAX_PORTS) sc->sc_noport = OCTUSB_MAX_PORTS; + /* set USB revision */ + sc->sc_bus.usbrev = USB_REV_2_0; + USB_BUS_LOCK(&sc->sc_bus); /* setup all ports */ From owner-p4-projects@FreeBSD.ORG Mon Jun 21 16:37:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0BF51065670; Mon, 21 Jun 2010 16:37:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CD9A106566B for ; Mon, 21 Jun 2010 16:37:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A80A8FC08 for ; Mon, 21 Jun 2010 16:37:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LGbBWM039702 for ; Mon, 21 Jun 2010 16:37:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LGbBGV039699 for perforce@freebsd.org; Mon, 21 Jun 2010 16:37:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 21 Jun 2010 16:37:11 GMT Message-Id: <201006211637.o5LGbBGV039699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 16:37:12 -0000 http://p4web.freebsd.org/@@180041?ac=10 Change 180041 by hselasky@hselasky_laptop001 on 2010/06/21 16:36:49 USB controller (OCTUSB): - fix bug regarding control endpoint - update Makefile to not compile removed file Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#4 edit .. //depot/projects/usb/src/sys/modules/usb/octusb/Makefile#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#4 (text+ko) ==== @@ -279,14 +279,14 @@ td->offset += 8; td->remainder -= 8; + /* setup data length and offset */ td->qh->fixup_len = UGETW(td->qh->fixup_buf + 6); + td->qh->fixup_off = 0; + if (td->qh->fixup_len > (OCTUSB_MAX_FIXUP - 8)) { td->error_any = 1; return (0); /* done */ } - td->qh->fixup_len += 8; - td->qh->fixup_off = 8; - /* do control IN request */ if (td->qh->fixup_buf[0] & UE_DIR_IN) { @@ -301,7 +301,7 @@ status = cvmx_usb_submit_control( &sc->sc_port[td->qh->port_index].state, td->qh->ep_handle, td->qh->fixup_phys, - td->qh->fixup_phys + 8ULL, td->qh->fixup_len - 8, + td->qh->fixup_phys + 8, td->qh->fixup_len, &octusb_complete_cb, td); /* check status */ if (status < 0) { @@ -337,7 +337,8 @@ DPRINTFN(1, "Excess setup transmit data\n"); return (0); /* done */ } - usbd_copy_out(td->pc, td->offset, td->qh->fixup_buf + td->qh->fixup_off, td->remainder); + usbd_copy_out(td->pc, td->offset, td->qh->fixup_buf + + td->qh->fixup_off + 8, td->remainder); td->offset += td->remainder; td->qh->fixup_off += td->remainder; @@ -360,12 +361,13 @@ return (0); /* done */ /* copy data from buffer */ - rem = 8 + td->qh->fixup_actlen - td->qh->fixup_off; + rem = td->qh->fixup_actlen - td->qh->fixup_off; if (rem > td->remainder) rem = td->remainder; - usbd_copy_in(td->pc, td->offset, td->qh->fixup_buf + td->qh->fixup_off, rem); + usbd_copy_in(td->pc, td->offset, td->qh->fixup_buf + + td->qh->fixup_off + 8, rem); td->offset += rem; td->remainder -= rem; @@ -408,7 +410,7 @@ status = cvmx_usb_submit_control( &sc->sc_port[td->qh->port_index].state, td->qh->ep_handle, td->qh->fixup_phys, - td->qh->fixup_phys + 8ULL, td->qh->fixup_len - 8, + td->qh->fixup_phys + 8, td->qh->fixup_len, &octusb_complete_cb, td); /* check status */ @@ -1119,18 +1121,23 @@ static void octusb_device_done(struct usb_xfer *xfer, usb_error_t error) { - struct octusb_td *td; - USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); DPRINTFN(2, "xfer=%p, endpoint=%p, error=%d\n", xfer, xfer->endpoint, error); - td = xfer->td_start[0]; + /* + * 1) Free any endpoints. + * 2) Control transfers can be split and we should not re-open + * the data pipe between transactions unless there is an error. + */ + if ((xfer->flags_int.control_act == 0) || (error != 0)) { + struct octusb_td *td; - /* free any endpoints */ - octusb_host_free_endpoint(td); + td = xfer->td_start[0]; + octusb_host_free_endpoint(td); + } /* dequeue transfer and start next transfer */ usbd_transfer_done(xfer, error); } ==== //depot/projects/usb/src/sys/modules/usb/octusb/Makefile#2 (text+ko) ==== @@ -32,6 +32,6 @@ KMOD= octusb SRCS= bus_if.h device_if.h usb_if.h \ opt_bus.h opt_usb.h \ - octusb_mips.c octusb.c octusb.h + octusb.c octusb.h .include From owner-p4-projects@FreeBSD.ORG Mon Jun 21 17:49:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 171F91065673; Mon, 21 Jun 2010 17:49:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7561106566B for ; Mon, 21 Jun 2010 17:49:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A413B8FC17 for ; Mon, 21 Jun 2010 17:49:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LHnUMf056883 for ; Mon, 21 Jun 2010 17:49:30 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LHnUlq056881 for perforce@freebsd.org; Mon, 21 Jun 2010 17:49:30 GMT (envelope-from trasz@freebsd.org) Date: Mon, 21 Jun 2010 17:49:30 GMT Message-Id: <201006211749.o5LHnUlq056881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180042 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 17:49:31 -0000 http://p4web.freebsd.org/@@180042?ac=10 Change 180042 by trasz@trasz_victim on 2010/06/21 17:48:38 Begin work on splitting HRL into HRL and containers. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/conf/files#28 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#1 add .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#74 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#1 add .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#43 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#14 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#7 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#20 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#17 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/conf/files#28 (text+ko) ==== @@ -2079,6 +2079,7 @@ kern/kern_condvar.c standard kern/kern_conf.c standard kern/kern_cons.c standard +kern/kern_container.c standard kern/kern_cpu.c standard kern/kern_cpuset.c standard kern/kern_context.c standard ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#74 (text+ko) ==== @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -110,13 +111,12 @@ { "sigxfsz", HRL_ACTION_SIGXFSZ }, { NULL, -1 }}; -static const char * hrl_resource_name(int resource); static void hrl_init(void); SYSINIT(hrl, SI_SUB_CPU, SI_ORDER_FIRST, hrl_init, NULL); static uma_zone_t hrl_rule_link_zone; static uma_zone_t hrl_rule_zone; -static struct mtx hrl_lock; +struct mtx hrl_lock; static void hrl_compute_available(struct proc *p, int64_t (*availablep)[]); static int hrl_rule_fully_specified(const struct hrl_rule *rule); @@ -162,7 +162,7 @@ panic("hrl_action_name: unknown action %d", action); } -static const char * +const char * hrl_resource_name(int resource) { int i; @@ -268,7 +268,7 @@ * to what it keeps allocated now. Returns non-zero if the allocation should * be denied, 0 otherwise. */ -static int +int hrl_enforce_proc(struct proc *p, int resource, uint64_t amount) { int64_t available[HRL_RESOURCE_MAX]; @@ -396,276 +396,6 @@ } } -static void -hrl_container_add(struct hrl_container *dest, const struct hrl_container *src) -{ - int i; - - mtx_assert(&hrl_lock, MA_OWNED); - - for (i = 0; i <= HRL_RESOURCE_MAX; i++) { - KASSERT(dest->hc_resources[i] >= 0, - ("resource usage propagation meltdown: dest < 0")); - KASSERT(src->hc_resources[i] >= 0, - ("resource usage propagation meltdown: src < 0")); - dest->hc_resources[i] += src->hc_resources[i]; - KASSERT(dest->hc_resources[i] >= 0, - ("resource usage propagation meltdown: dest < 0 after addition")); - } -} - -static void -hrl_container_subtract(struct hrl_container *dest, const struct hrl_container *src) -{ - int i; - - mtx_assert(&hrl_lock, MA_OWNED); - - for (i = 0; i <= HRL_RESOURCE_MAX; i++) { - KASSERT(dest->hc_resources[i] >= 0, - ("resource usage propagation meltdown: dest < 0")); - KASSERT(src->hc_resources[i] >= 0, - ("resource usage propagation meltdown: src < 0")); - KASSERT(src->hc_resources[i] <= dest->hc_resources[i], - ("resource usage propagation meltdown: src > dest")); - dest->hc_resources[i] -= src->hc_resources[i]; - KASSERT(dest->hc_resources[i] >= 0, - ("resource usage propagation meltdown: dest < 0 after subtraction")); - } -} - -static void -hrl_container_join(struct hrl_container *child, struct hrl_container *parent) -{ - int i; - - mtx_assert(&hrl_lock, MA_OWNED); - KASSERT(child != NULL, ("child != NULL")); - KASSERT(parent != NULL, ("parent != NULL")); - - for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { - KASSERT(child->hc_parents[i] != parent, - ("container already joined")); - if (child->hc_parents[i] == NULL) { - child->hc_parents[i] = parent; - hrl_container_add(parent, child); - return; - } - } - panic("container has too many parents"); -} - -static void -hrl_container_leave(struct hrl_container *child, struct hrl_container *parent) -{ - int i; - - mtx_assert(&hrl_lock, MA_OWNED); - KASSERT(child != NULL, ("child != NULL")); - KASSERT(parent != NULL, ("parent != NULL")); - - for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { - if (child->hc_parents[i] == parent) { - hrl_container_subtract(parent, child); - child->hc_parents[i] = NULL; - return; - } - } - panic("container not joined"); -} - -static void -hrl_container_leave_parents(struct hrl_container *child) -{ - int i; - - mtx_assert(&hrl_lock, MA_OWNED); - KASSERT(child != NULL, ("child != NULL")); - - for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { - if (child->hc_parents[i] == NULL) - continue; - hrl_container_subtract(child->hc_parents[i], child); - child->hc_parents[i] = NULL; - } -} - -void -hrl_container_create(struct hrl_container *container) -{ - int i; - - for (i = 0; i <= HRL_RESOURCE_MAX; i++) - KASSERT(container->hc_resources[i] == 0, - ("container->hc_resources[%d] != NULL", i)); - for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) - KASSERT(container->hc_parents[i] == NULL, - ("container->hc_parents[%d] != NULL", i)); -} - -void -hrl_container_destroy(struct hrl_container *container) -{ - int i; - - mtx_lock(&hrl_lock); - for (i = 0; i <= HRL_RESOURCE_MAX; i++) { - if (container->hc_resources[i] != 0) - printf("destroying non-empty container: " - "%ju allocated for resource %s", - container->hc_resources[i], - hrl_resource_name(i)); - container->hc_resources[i] = 0; - } - - hrl_container_leave_parents(container); - mtx_unlock(&hrl_lock); -} - -#ifdef DIAGNOSTIC -/* - * Go through the resource consumption information and make sure it makes sense. - */ -static void -hrl_container_assert(const struct hrl_container *container) -{ - int i, resource; - struct hrl_container *parent; - - mtx_assert(&hrl_lock, MA_OWNED); - KASSERT(container != NULL, ("NULL container")); - - for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++) { - KASSERT(container->hc_resources[resource] >= 0, - ("resource usage propagation meltdown: resource < 0")); - } - - for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { - parent = container->hc_parents[i]; - if (parent == NULL); - continue; - hrl_container_assert(parent); - for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++) { - KASSERT(parent->hc_resources[resource] >= - container->hc_resources[resource], - ("resource usage propagation meltdown: child > parent")); - } - } -} -#endif /* DIAGNOSTIC */ - -/* - * Increase consumption of 'resource' by 'amount' for 'container' - * and all its parents. Differently from other cases, 'amount' here - * may be less than zero. - */ -static void -hrl_container_alloc_resource(struct hrl_container *container, int resource, - uint64_t amount) -{ - int i; - - mtx_assert(&hrl_lock, MA_OWNED); - KASSERT(container != NULL, ("NULL container")); - - container->hc_resources[resource] += amount; - for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { - if (container->hc_parents[i] == NULL) - continue; - hrl_container_alloc_resource(container->hc_parents[i], resource, amount); - } -#ifdef DIAGNOSTIC - hrl_container_assert(container); -#endif -} - -/* - * Increase allocation of 'resource' by 'amount' for process 'p'. - * Return 0 if it's below limits, or errno, if it's not. - */ -int -hrl_alloc(struct proc *p, int resource, uint64_t amount) -{ - int error; - -#if 0 - printf("hrl_alloc: allocating %ju of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid); -#endif - - KASSERT(amount > 0, ("hrl_alloc: invalid amount for %s: %ju", - hrl_resource_name(resource), amount)); - - mtx_lock(&hrl_lock); - error = hrl_enforce_proc(p, resource, amount); - if (error) { - mtx_unlock(&hrl_lock); - return (error); - } - hrl_container_alloc_resource(&p->p_container, resource, amount); - mtx_unlock(&hrl_lock); - - return (0); -} - -/* - * Set allocation of 'resource' to 'amount' for process 'p'. - * Return 0 if it's below limits, or errno, if it's not. - * - * Note that decreasing the allocation always returns 0, - * even if it's above the limit. - */ -int -hrl_allocated(struct proc *p, int resource, uint64_t amount) -{ - int error; - int64_t diff; - -#if 0 - printf("hrl_allocated: allocated %lld of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid); -#endif - - KASSERT(amount >= 0, ("hrl_allocated: invalid amount for %s: %ju", - hrl_resource_name(resource), amount)); - - mtx_lock(&hrl_lock); - diff = amount - p->p_container.hc_resources[resource]; - if (diff > 0) { - error = hrl_enforce_proc(p, resource, diff); - if (error) { - mtx_unlock(&hrl_lock); - return (error); - } - } - hrl_container_alloc_resource(&p->p_container, resource, diff); - mtx_unlock(&hrl_lock); - - return (0); -} - -/* - * Decrease allocation of 'resource' by 'amount' for process 'p'. - */ -void -hrl_free(struct proc *p, int resource, uint64_t amount) -{ - -#if 0 - printf("hrl_free: freeing %lld of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid); -#endif - - KASSERT(amount > 0, ("hrl_free: invalid amount for %s: %ju", - hrl_resource_name(resource), amount)); - - mtx_lock(&hrl_lock); - KASSERT(amount <= p->p_container.hc_resources[resource], - ("hrl_free: freeing %ju of %s, which is more than allocated " - "%ld for %s (pid %d)", amount, hrl_resource_name(resource), - p->p_container.hc_resources[resource], p->p_comm, p->p_pid)); - - hrl_container_alloc_resource(&p->p_container, resource, -amount); - mtx_unlock(&hrl_lock); -} - static int hrl_rule_matches(const struct hrl_rule *rule, const struct hrl_rule *filter) { ==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#43 (text+ko) ==== @@ -94,22 +94,6 @@ * 'hr_per' takes the same flags as 'hr_subject_type'. */ -#define HRL_RESOURCE_UNDEFINED -1 -#define HRL_RESOURCE_CPUTIME 0x0000 -#define HRL_RESOURCE_FILESIZE 0x0001 -#define HRL_RESOURCE_DATASIZE 0x0002 -#define HRL_RESOURCE_STACKSIZE 0x0003 -#define HRL_RESOURCE_COREDUMPSIZE 0x0004 -#define HRL_RESOURCE_MEMORYUSE 0x0005 -#define HRL_RESOURCE_MEMORYLOCKED 0x0006 -#define HRL_RESOURCE_MAXPROCESSES 0x0007 -#define HRL_RESOURCE_FILEDESCRIPTORS 0x0008 -#define HRL_RESOURCE_SBSIZE 0x0009 -#define HRL_RESOURCE_VMEMORYUSE 0x000a -#define HRL_RESOURCE_PTY 0x000b -#define HRL_RESOURCE_SWAP 0x000c -#define HRL_RESOURCE_MAX HRL_RESOURCE_SWAP - #define HRL_ACTION_UNDEFINED -1 #define HRL_ACTION_DENY 0x0000 #define HRL_ACTION_DELAY 0x0001 @@ -124,45 +108,8 @@ #define HRL_AMOUNT_UNDEFINED -1 -/* - * Processes may have at most three parent containers - prison, uidinfo, - * and loginclass. Other subjects have less - struct prison may have only - * one parent container, loginclass and uidinfo structures have none. - * This may change when - and if - we add per-group resource limits. - */ -#define HRL_HC_PARENTS_MAX 3 - -/* - * 'hrl_container' defines resource consumption for a particular - * subject, such as process or jail. Containers form a graph - each - * container has zero or more subcontainers and zero or more - * "containing" containers (parents). For example, container for - * an uidinfo can have several subcontainers for processes of that - * user. On the other hand, each process can have several containing - * containers - one for jail the process is in, one for the user, - * one for every group this process belongs to (note that per-group - * limits are not implemented yet). - * - * Every process has exactly one container assigned to it. Containers - * for other objects are initialized when there is a rule which requires - * it. For example, uidinfo will have container assigned only if there - * is a rule this uidinfo is subject to, and 'hr_per' for this rule - * is HRL_SUBJECT_TYPE_USER. - * - * This structure must be filled with zeroes initially. - */ -struct hrl_container { - int64_t hc_resources[HRL_RESOURCE_MAX + 1]; - struct hrl_container *hc_parents[HRL_HC_PARENTS_MAX + 1]; - LIST_HEAD(, hrl_rule_link) hc_rule_links; -}; - #ifdef _KERNEL -int hrl_alloc(struct proc *p, int object, uint64_t amount); -int hrl_allocated(struct proc *p, int object, uint64_t amount); -void hrl_free(struct proc *p, int object, uint64_t amount); - void hrl_proc_exiting(struct proc *p); void hrl_proc_init(struct proc *p); @@ -175,8 +122,8 @@ int hrl_rule_add(struct hrl_rule *rule); int hrl_rule_remove(const struct hrl_rule *filter); -void hrl_container_create(struct hrl_container *container); -void hrl_container_destroy(struct hrl_container *container); +int hrl_enforce_proc(struct proc *p, int resource, uint64_t amount); +const char *hrl_resource_name(int resource); #else /* !_KERNEL */ ==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ #ifndef _SYS_JAIL_H_ #define _SYS_JAIL_H_ -#include +#include #ifdef _KERNEL struct jail_v0 { ==== //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef _SYS_LOGINCLASS_H_ #define _SYS_LOGINCLASS_H_ -#include +#include /* * Exactly one of these structures exists per login class. ==== //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#20 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef _KERNEL #include #endif -#include +#include #include #include #include ==== //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#17 (text+ko) ==== @@ -38,6 +38,7 @@ #ifdef _KERNEL #include #include +#include #include #endif From owner-p4-projects@FreeBSD.ORG Mon Jun 21 18:13:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC6C3106566C; Mon, 21 Jun 2010 18:13:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 902491065675 for ; Mon, 21 Jun 2010 18:13:57 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D4808FC08 for ; Mon, 21 Jun 2010 18:13:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LIDv5i059744 for ; Mon, 21 Jun 2010 18:13:57 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LIDvIJ059742 for perforce@freebsd.org; Mon, 21 Jun 2010 18:13:57 GMT (envelope-from afiveg@FreeBSD.org) Date: Mon, 21 Jun 2010 18:13:57 GMT Message-Id: <201006211813.o5LIDvIJ059742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 18:13:58 -0000 http://p4web.freebsd.org/@@180043?ac=10 Change 180043 by afiveg@cottonmouth on 2010/06/21 18:13:17 Port ringmap to current "em". Begin to work with interrupt functions. New functions pointer: ringmap->(*interrupt)(). Must be initialized in set_ringmap_funcs(). The hardware dependent interrupt function for 8254-cotroller is rm_8254_ringmap, will called from lem_handle_rxtx(). Affected files ... .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#7 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#5 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#3 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#6 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#9 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#9 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#7 (text+ko) ==== @@ -1381,15 +1381,17 @@ struct adapter *adapter = context; struct ifnet *ifp = adapter->ifp; - if (ifp->if_drv_flags & IFF_DRV_RUNNING) { if (lem_rxeof(adapter, adapter->rx_process_limit) != 0) taskqueue_enqueue(adapter->tq, &adapter->rxtx_task); + +#if (RINGMAP_TX_ENABLE) EM_TX_LOCK(adapter); lem_txeof(adapter); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) lem_start_locked(ifp); EM_TX_UNLOCK(adapter); +#endif } lem_enable_intr(adapter); @@ -1431,6 +1433,16 @@ * MSI message reordering errata on certain systems. */ lem_disable_intr(adapter); + +#ifdef RINGMAP + if ((adapter->rm != NULL) && /* ringmap structure should be allocated */ + (adapter->rm->ring != NULL) && + (adapter->rm->ring->td != NULL)) + { + adapter->rm->funcs->interrupt(arg); + } +#endif + taskqueue_enqueue(adapter->tq, &adapter->rxtx_task); /* Link status change */ ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#5 (text+ko) ==== @@ -25,13 +25,28 @@ void rm_8254_disable_intr(device_t); int rm_8254_set_slot(struct ring *, struct adapter *, unsigned int); void rm_8254_print_slot(struct ring *, unsigned int); - +void rm_8254_interrupt(void *); +int rm_8254_print_ring_pointers(struct adapter *); extern devclass_t em_devclass; extern void lem_enable_intr(struct adapter *); extern void lem_disable_intr(struct adapter *); + +void +rm_8254_interrupt(void *arg) +{ + struct adapter *adapter = (struct adapter *) arg; + /* count interrupts */ + adapter->rm->ring->interrupts_counter++; + +#if (RINGMAP_INTR_DEB) + rm_8254_print_ring_pointers(adapter); +#endif +} + + /* * Get adapter structure of device and initialize the * pointers in ring (mbufs, packets, decriptors) with values @@ -66,7 +81,14 @@ RINGMAP_ERROR(SLOTS_NUMBER should be equal to the num_rx_desc); return (-1); } + + /* Set ring fields in the initial state */ + ring->kern_wait_user = 0; + ring->user_wait_kern = 0; + ring->interrupts_counter = 0; + ring->size = SLOTS_NUMBER; + /* Set ring pointers */ for (slot_num = 0 ; slot_num < SLOTS_NUMBER ; slot_num ++){ if (rm_8254_set_slot(ring, adapter, slot_num) == -1){ RINGMAP_ERROR(Ring initialization failed!); @@ -232,3 +254,24 @@ adapter = (struct adapter *)device_get_softc(dev); return (adapter->rm); } + + +int +rm_8254_print_ring_pointers(struct adapter *adapter) +{ + unsigned int rdt, rdh; + struct ringmap *rm = adapter->rm; + + rdh = RINGMAP_HW_READ_HEAD(adapter); + rdt = RINGMAP_HW_READ_TAIL(adapter); + + printf("\n +++++++++ RING POINTERS ++++++++++++ \n"); + printf(" + HW HEAD = %d (KERN POINTER)\n", rdh); + printf(" + HW TAIL = %d (USER POINTER)\n", rdt); + printf(" +\n"); + printf(" + kernrp = %d \n", rm->ring->kernrp); + printf(" + userrp = %d \n", rm->ring->userrp); + printf(" ++++++++++++++++++++++++++++++++++++++ \n\n"); + + return (0); +} ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#3 (text+ko) ==== @@ -15,3 +15,13 @@ #define GET_DESCRIPTOR_P(adapter, i) \ (&(DESC_AREA(adapter)[(i)])) + +/* Registers access */ +#define RINGMAP_HW_READ_REG E1000_READ_REG + +#define RINGMAP_HW_READ_HEAD(adapter) \ + RINGMAP_HW_READ_REG(&adapter->hw, E1000_RDH(0)) + +#define RINGMAP_HW_READ_TAIL(adapter) \ + RINGMAP_HW_READ_REG(&adapter->hw, E1000_RDT(0)) + ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#6 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#9 (text+ko) ==== @@ -54,6 +54,7 @@ extern device_t rm_8254_get_device_p(struct cdev *); extern void rm_8254_enable_intr(device_t); extern void rm_8254_disable_intr(device_t); +extern void rm_8254_interrupt(struct ringmap *); //struct adapter* get_adapter_struct(struct cdev *dev); //int ringmap_print_ring_pointers(struct adapter *); @@ -131,6 +132,7 @@ rm->funcs->enable_intr = rm_8254_enable_intr; rm->funcs->disable_intr = rm_8254_disable_intr; rm->funcs->init_slots = rm_8254_init_slots; + rm->funcs->interrupt = rm_8254_interrupt; get_ringmap_p = rm_8254_get_ringmap_p; get_device_p = rm_8254_get_device_p; @@ -245,14 +247,15 @@ /****************************************************************** - * Open device and get the pointer of user process structure!!! + * Open device and get the pointer of user process structure. * We will use the address space of this process to map there - * the mbufs and buffers with packet data. So it all will - * be placed and accesseble in this user proccess. + * the mbufs and buffers with packets data. So it all will + * be accesseble in this user proccess. ******************************************************************/ int ringmap_open(struct cdev *cdev, int flag, int otyp, struct thread *td) { + int err = 0; struct ringmap *rm = NULL; struct ring *ring = NULL; @@ -275,15 +278,14 @@ **/ if (!atomic_cmpset_int(&rm->open_cnt, 0, 1)){ RINGMAP_ERROR(Sorry! Can not open device more then one time!); - contigfree(rm->ring, sizeof(struct ring), M_DEVBUF); - atomic_readandclear_int(&rm->open_cnt); - return (ENODEV); + err = ENODEV; + goto end; } - if (rm->dev == NULL) { + if (rm->dev == NULL){ RINGMAP_ERROR(Null pointer to device structure of adapter); - atomic_readandclear_int(&rm->open_cnt); - return (ENODEV); + err = ENODEV; + goto end; } /* @@ -295,40 +297,33 @@ M_DEVBUF, M_ZERO, 0, -1L, PAGE_SIZE, 0); if (ring == NULL) { RINGMAP_ERROR(Can not allocate space for ring structure); - atomic_readandclear_int(&rm->open_cnt); - return (ENODEV); + err = ENODEV; + goto end; } rm->ring = ring; - /* Store pointer to the thread */ rm->ring->td = td; /* Disable interrupts of adapter */ rm->funcs->disable_intr(rm->dev); - /* Prepare ring for caputure */ - rm->ring->kern_wait_user = 0; - rm->ring->user_wait_kern = 0; - rm->ring->interrupts_counter = 0; - rm->ring->size = SLOTS_NUMBER; - - if (rm->funcs->init_slots(rm->ring, rm->dev) == -1){ - RINGMAP_ERROR(Can not initialize ring slots. Device is not opened!); + if (rm->funcs->init_slots(rm->ring, rm->dev) == -1){ + RINGMAP_ERROR(The ring is not initialized. Device will not be opened!); contigfree(rm->ring, sizeof(struct ring), M_DEVBUF); - atomic_readandclear_int(&rm->open_cnt); - return (ENODEV); + err = ENODEV; } -// rm->ring->hw_stats.kern = (vm_offset_t)(&adapter->stats); -// rm->ring->hw_stats.phys = (bus_addr_t)vtophys(&adapter->stats); + rm->funcs->enable_intr(rm->dev); - rm->funcs->enable_intr(rm->dev); +end: + atomic_readandclear_int(&rm->open_cnt); RINGMAP_FUNC_DEBUG(end); - return (0); + return (err); + } @@ -352,6 +347,7 @@ if (rm->ring != NULL){ contigfree(rm->ring, sizeof(struct ring), M_DEVBUF); + rm->ring = NULL; } else { RINGMAP_ERROR(The pointer to ring structure is NULL); } @@ -363,7 +359,8 @@ } int -ringmap_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr) +ringmap_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int nprot, vm_memattr_t *memattr) { // struct adapter *adapter = (struct adapter *)get_adapter_struct(dev); // struct ringmap *rm = adapter->rm; ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#9 (text+ko) ==== @@ -24,6 +24,9 @@ */ #define DEV_ID 0 +/* Enable/Disable Transiv */ +#define RINGMAP_TX_ENABLE 0 + struct address { bus_addr_t phys; @@ -140,6 +143,7 @@ void (*enable_intr)(device_t); void (*disable_intr)(device_t); int (*init_slots)(struct ring *, device_t); + void (*interrupt)(struct ringmap*); }; #endif /* _KERNEL */ @@ -242,10 +246,10 @@ #define IOCTL_DEB 1 #endif -#ifndef INTR_DEB -#define INTR_DEB 0 +#ifndef RINGMAP_INTR_DEB +#define RINGMAP_INTR_DEB 1 #else -#define INTR_DEB 1 +#define RINGMAP_INTR_DEB 1 #endif #ifndef __RINGMAP_DEB From owner-p4-projects@FreeBSD.ORG Mon Jun 21 19:09:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D666E1065674; Mon, 21 Jun 2010 19:09:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E21F106566C for ; Mon, 21 Jun 2010 19:09:07 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69CD58FC14 for ; Mon, 21 Jun 2010 19:09:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LJ97H4064821 for ; Mon, 21 Jun 2010 19:09:07 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LJ8vjS064811 for perforce@freebsd.org; Mon, 21 Jun 2010 19:08:57 GMT (envelope-from peter@wemm.org) Date: Mon, 21 Jun 2010 19:08:57 GMT Message-Id: <201006211908.o5LJ8vjS064811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 19:09:08 -0000 http://p4web.freebsd.org/@@180045?ac=10 Change 180045 by peter@peter_daintree on 2010/06/21 19:08:46 IFC @180044 Affected files ... .. //depot/projects/hammer/Makefile#60 integrate .. //depot/projects/hammer/Makefile.inc1#154 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#79 integrate .. //depot/projects/hammer/UPDATING#144 integrate .. //depot/projects/hammer/bin/chio/chio.c#5 integrate .. //depot/projects/hammer/bin/cp/cp.c#17 integrate .. //depot/projects/hammer/bin/date/date.1#17 integrate .. //depot/projects/hammer/bin/getfacl/getfacl.1#10 integrate .. //depot/projects/hammer/bin/ln/ln.c#10 integrate .. //depot/projects/hammer/bin/ln/symlink.7#7 integrate .. //depot/projects/hammer/bin/pax/pat_rep.c#7 integrate .. //depot/projects/hammer/bin/pkill/pkill.1#6 integrate .. //depot/projects/hammer/bin/pkill/pkill.c#9 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.1#14 integrate .. //depot/projects/hammer/bin/sh/arith.y#9 integrate .. //depot/projects/hammer/bin/sh/arith_lex.l#7 integrate .. //depot/projects/hammer/bin/sh/cd.c#8 integrate .. //depot/projects/hammer/bin/sh/cd.h#3 integrate .. //depot/projects/hammer/bin/sh/eval.c#28 integrate .. //depot/projects/hammer/bin/sh/expand.c#21 integrate .. //depot/projects/hammer/bin/sh/histedit.c#11 integrate .. //depot/projects/hammer/bin/sh/jobs.c#18 integrate .. //depot/projects/hammer/bin/sh/main.c#12 integrate .. //depot/projects/hammer/bin/sh/myhistedit.h#4 integrate .. //depot/projects/hammer/bin/sh/parser.c#22 integrate .. //depot/projects/hammer/bin/sh/sh.1#36 integrate .. //depot/projects/hammer/bin/sh/var.c#20 integrate .. //depot/projects/hammer/bin/sh/var.h#7 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb.c#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#5 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#5 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#5 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#7 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#3 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#21 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#16 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#14 integrate .. //depot/projects/hammer/contrib/bind9/version#21 integrate .. //depot/projects/hammer/contrib/binutils/bfd/archures.c#4 integrate .. //depot/projects/hammer/contrib/binutils/bfd/bfd-in2.h#5 integrate .. //depot/projects/hammer/contrib/binutils/bfd/cpu-mips.c#4 integrate .. //depot/projects/hammer/contrib/binutils/bfd/elfxx-mips.c#2 integrate .. //depot/projects/hammer/contrib/binutils/gas/config/tc-mips.c#3 integrate .. //depot/projects/hammer/contrib/binutils/gas/config/tc-mips.h#2 integrate .. //depot/projects/hammer/contrib/binutils/include/elf/mips.h#3 integrate .. //depot/projects/hammer/contrib/binutils/include/opcode/mips.h#4 integrate .. //depot/projects/hammer/contrib/binutils/opcodes/mips-dis.c#2 integrate .. //depot/projects/hammer/contrib/binutils/opcodes/mips-opc.c#2 integrate .. //depot/projects/hammer/contrib/binutils/opcodes/mips16-opc.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmpdef/gensnmpdef.1#6 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.1#9 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.3#7 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpagent.3#7 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpclient.3#8 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmplib.3#7 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.3#8 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/bsnmpd.1#8 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.3#10 integrate .. //depot/projects/hammer/contrib/gcc/config/fixdfdi.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/fixsfdi.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/fixunsdfsi.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/fixunssfsi.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/floatdidf.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/floatdisf.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/floatundidf.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/floatundisf.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/mips/freebsd.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/mips/mips.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/mips/mips.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/mips/mips.md#2 integrate .. //depot/projects/hammer/contrib/gdtoa/hexnan.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipmon.8#10 integrate .. //depot/projects/hammer/contrib/llvm/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/CREDITS.TXT#1 branch .. //depot/projects/hammer/contrib/llvm/LICENSE.TXT#1 branch .. //depot/projects/hammer/contrib/llvm/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/Makefile.common#1 branch .. //depot/projects/hammer/contrib/llvm/Makefile.config.in#1 branch .. //depot/projects/hammer/contrib/llvm/Makefile.rules#1 branch .. //depot/projects/hammer/contrib/llvm/ModuleInfo.txt#1 branch .. //depot/projects/hammer/contrib/llvm/README.txt#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/AutoRegen.sh#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/ExportMap.map#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/LICENSE.TXT#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/README.TXT#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/config.guess#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/config.sub#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/configure.ac#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/depcomp#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/install-sh#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/ltmain.sh#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/bison.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/build_exeext.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/c_printf_a.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/check_gnu_make.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/config_makefile.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/config_project.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/cxx_bidi_iterator.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/cxx_flag_check.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/cxx_fwd_iterator.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/cxx_namespaces.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/cxx_std_iterator.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/find_std_program.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/flex.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/func_isinf.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/func_isnan.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/func_mmap_file.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/header_mmap_anonymous.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/huge_val.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/libtool.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/link_options.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/linux_mixed_64_32.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/ltdl.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/need_dev_zero_for_mmap.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/path_perl.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/path_tclsh.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/rand48.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/sanity_check.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/single_cxx_check.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/m4/visibility_inlines_hidden.m4#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/missing#1 branch .. //depot/projects/hammer/contrib/llvm/autoconf/mkinstalldirs#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/README.txt#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/analysis/llvm_analysis-binding.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/analysis/llvm_analysis.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/analysis/llvm_analysis_wrap.cxx#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader-binding.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/bitreader/llvm_bitreader_wrap.cxx#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer-binding.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/bitwriter/llvm_bitwriter_wrap.cxx#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine-binding.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/executionengine/llvm_executionengine_wrap.cxx#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/llvm.gpr#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/llvm/llvm-binding.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/llvm/llvm.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer-binding.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/llvm/llvm_linktimeoptimizer_wrap.cxx#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/llvm/llvm_wrap.cxx#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/target/llvm_target-binding.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/target/llvm_target.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/target/llvm_target_wrap.cxx#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/transforms/llvm_transforms-binding.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/transforms/llvm_transforms.ads#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ada/transforms/llvm_transforms_wrap.cxx#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/Makefile.ocaml#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/analysis/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/analysis/analysis_ocaml.c#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.ml#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.mli#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/bitreader/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/bitreader/bitreader_ocaml.c#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.ml#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.mli#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/bitwriter/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/bitwriter/bitwriter_ocaml.c#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.ml#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.mli#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/executionengine/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.ml#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.mli#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/llvm/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/llvm/llvm.ml#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/llvm/llvm.mli#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/llvm/llvm_ocaml.c#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/target/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/target/llvm_target.ml#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/target/llvm_target.mli#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/target/target_ocaml.c#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/transforms/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/transforms/scalar/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.ml#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.mli#1 branch .. //depot/projects/hammer/contrib/llvm/bindings/ocaml/transforms/scalar/scalar_opts_ocaml.c#1 branch .. //depot/projects/hammer/contrib/llvm/build-for-llvm-top.sh#1 branch .. //depot/projects/hammer/contrib/llvm/configure#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Analysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/BitReader.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/BitWriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Core.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/EnhancedDisassembly.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/ExecutionEngine.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Target.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Transforms/IPO.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/Transforms/Scalar.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm-c/lto.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/APFloat.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/APInt.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/APSInt.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/BitVector.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/DeltaAlgorithm.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/DenseMap.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/DenseMapInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/DenseSet.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/DepthFirstIterator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/FoldingSet.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/GraphTraits.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ImmutableList.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ImmutableMap.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ImmutableSet.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/IndexedMap.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Optional.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/OwningPtr.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/PointerIntPair.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/PointerUnion.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/PostOrderIterator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/PriorityQueue.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SCCIterator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/STLExtras.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ScopedHashTable.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SetOperations.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SetVector.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SmallBitVector.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SmallPtrSet.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SmallSet.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SmallString.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SmallVector.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/SparseBitVector.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Statistic.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/StringExtras.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/StringMap.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/StringRef.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/StringSet.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/StringSwitch.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Trie.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Triple.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/Twine.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/UniqueVector.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ValueMap.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/VectorExtras.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ilist.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/ilist_node.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/iterator.cmake#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ADT/iterator.h.in#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/AbstractTypeUser.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/CFGPrinter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/CallGraph.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/CaptureTracking.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ConstantFolding.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ConstantsScanner.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/DebugInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/DomPrinter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/DominatorInternals.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/Dominators.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/IVUsers.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/InlineCost.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/Interval.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/IntervalIterator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/IntervalPartition.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/Lint.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LiveValues.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LoopInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/LoopPass.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/PHITransAddr.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/Passes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/PointerTracking.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/PostDominators.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ProfileInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ProfileInfoLoader.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ProfileInfoTypes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ScalarEvolutionNormalization.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/SparsePropagation.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/Trace.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/ValueTracking.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Analysis/Verifier.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Argument.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Assembly/AsmAnnotationWriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Assembly/Parser.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Assembly/PrintModulePass.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Assembly/Writer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Attributes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/AutoUpgrade.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/BasicBlock.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/Archive.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/BitCodes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CallGraphSCCPass.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CallingConv.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/Analysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/BinaryObject.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/FastISel.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/GCMetadata.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/GCMetadataPrinter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/GCStrategy.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/GCs.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/IntrinsicLowering.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LatencyPriorityQueue.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LinkAllAsmWriterComponents.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/LiveVariables.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachORelocation.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineCodeInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineDominators.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineJumpTableInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineLocation.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineModuleInfoImpls.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachinePassRegistry.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineRelocation.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/MachineSSAUpdater.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ObjectCodeEmitter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/Passes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/PseudoSourceValue.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/RegAllocRegistry.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ScheduleHazardRecognizer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SchedulerRegistry.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CodeGen/ValueTypes.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Action.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/BuiltinOptions.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Common.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Error.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/ForceLinkage.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/ForceLinkageMacros.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Main.inc#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Plugin.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/CompilerDriver/Tool.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Config/AsmParsers.def.in#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Config/AsmPrinters.def.in#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Config/Disassemblers.def.in#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Config/Targets.def.in#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Config/config.h.cmake#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Config/config.h.in#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Constant.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Constants.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/DerivedTypes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ExecutionEngine/GenericValue.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ExecutionEngine/Interpreter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ExecutionEngine/JIT.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Function.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/GVMaterializer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalAlias.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalValue.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/GlobalVariable.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/InlineAsm.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/InstrTypes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Instruction.def#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Instruction.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Instructions.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicInst.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Intrinsics.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Intrinsics.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicsARM.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicsAlpha.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicsCellSPU.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicsPowerPC.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicsX86.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/IntrinsicsXCore.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/LLVMContext.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/LinkAllPasses.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/LinkAllVMCore.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Linker.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/EDInstInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAsmInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAsmInfoCOFF.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAsmInfoDarwin.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAsmLayout.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCAssembler.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCCodeEmitter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCContext.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCDirectives.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCDisassembler.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCExpr.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCFixup.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCInst.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCInstPrinter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCLabel.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCMachOSymbolFlags.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCObjectWriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCParser/AsmCond.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCParser/AsmParser.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCSection.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCSectionCOFF.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCSectionELF.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCSectionMachO.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCStreamer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCSymbol.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MCValue.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/MachObjectWriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/MC/SectionKind.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Metadata.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Module.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/OperandTraits.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Operator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Pass.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/PassAnalysisSupport.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/PassManager.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/PassManagers.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/PassSupport.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/AlignOf.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Allocator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/CFG.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/CallSite.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Casting.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/CommandLine.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Compiler.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/ConstantFolder.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/ConstantRange.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/DOTGraphTraits.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/DataFlow.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/DataTypes.h.cmake#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/DataTypes.h.in#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Debug.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/DebugLoc.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Dwarf.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/DynamicLinker.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/ELF.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/ErrorHandling.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/FileUtilities.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Format.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/FormattedStream.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/GetElementPtrTypeIterator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/GraphWriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/IRBuilder.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/IRReader.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/InstIterator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/InstVisitor.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/LeakDetector.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/MachO.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/ManagedStatic.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/MathExtras.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/MemoryBuffer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/MemoryObject.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/MutexGuard.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/NoFolder.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/OutputBuffer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/PassNameParser.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/PatternMatch.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/PluginLoader.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/PointerLikeTypeTraits.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/PredIteratorCache.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/PrettyStackTrace.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Recycler.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/RecyclingAllocator.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Regex.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Registry.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/RegistryParser.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/SMLoc.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/SlowOperationInformer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/SourceMgr.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/StableBasicBlockNumbering.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/StandardPasses.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/StringPool.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/SystemUtils.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/TargetFolder.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/Timer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/TypeBuilder.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/ValueHandle.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/circular_raw_ostream.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/raw_os_ostream.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/raw_ostream.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Support/type_traits.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/SymbolTableListTraits.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/AIXDataTypesFix.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Alarm.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Atomic.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/DataTypes.h.cmake#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/DataTypes.h.in#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Disassembler.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/DynamicLibrary.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Errno.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Host.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/IncludeFile.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/LICENSE.TXT#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Memory.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Mutex.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Path.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Process.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Program.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/RWMutex.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Signals.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Solaris.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/ThreadLocal.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Threading.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/TimeValue.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/System/Valgrind.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/Mangler.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/SubtargetFeature.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/Target.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetAsmBackend.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetAsmLexer.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetAsmParser.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetCallingConv.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetData.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetFrameInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetIntrinsicInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetJITInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetLowering.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetMachine.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetOpcodes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetOptions.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetRegistry.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSchedule.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSelect.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSelectionDAGInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Target/TargetSubtarget.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/IPO.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Instrumentation.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/RSProfiling.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Scalar.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/AddrModeMatcher.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/BasicInliner.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/FunctionUtils.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/Local.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/PromoteMemToReg.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdaterImpl.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/SSI.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Transforms/Utils/UnrollLoop.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Type.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/TypeSymbolTable.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Use.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/User.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/Value.h#1 branch .. //depot/projects/hammer/contrib/llvm/include/llvm/ValueSymbolTable.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/AliasAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/AliasDebugger.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/AliasSetTracker.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/Analysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/CFGPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/CaptureTracking.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ConstantFolding.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/DebugInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/DomPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/IPA/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/IPA/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/IVUsers.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/InlineCost.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/InstCount.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/Interval.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/IntervalPartition.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/LazyValueInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/LibCallSemantics.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/Lint.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/LiveValues.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/LoopInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/LoopPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/PHITransAddr.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/PointerTracking.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/PostDominators.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ProfileInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ProfileInfoLoader.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/README.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/SparsePropagation.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/Trace.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Analysis/ValueTracking.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Archive/Archive.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Archive/ArchiveInternals.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Archive/ArchiveReader.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Archive/ArchiveWriter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Archive/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Archive/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/AsmParser/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLLexer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLLexer.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLParser.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLParser.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/AsmParser/LLToken.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/AsmParser/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/AsmParser/Parser.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Reader/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Reader/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/BitWriter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/Analysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AntiDepBreaker.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/BranchFolding.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/BranchFolding.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ELF.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ELFWriter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ELFWriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/GCMetadata.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/GCMetadataPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/GCStrategy.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/IfConversion.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LiveInterval.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LiveVariables.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/LowerSubregs.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineCSE.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineDominators.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineFunction.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineFunctionPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineInstr.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineLICM.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachinePassRegistry.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineSSAUpdater.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineSink.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ObjectCodeEmitter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/OcamlGC.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/OptimizeExts.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PBQP/Graph.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PBQP/HeuristicBase.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PBQP/HeuristicSolver.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PBQP/Heuristics/Briggs.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PBQP/Math.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PBQP/Solution.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PHIElimination.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PHIElimination.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/Passes.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/PseudoSourceValue.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/README.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocLocal.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/CallingConvLower.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeOrdering.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SelectionDAG/TargetSelectionDAGInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SimpleHazardRecognizer.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/SlotIndexes.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/Spiller.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/Spiller.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/StackProtector.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/TailDuplication.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/VirtRegMap.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/VirtRegMap.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CodeGen/VirtRegRewriter.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CompilerDriver/Action.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CompilerDriver/BuiltinOptions.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CompilerDriver/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CompilerDriver/CompilationGraph.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CompilerDriver/Main.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CompilerDriver/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CompilerDriver/Plugin.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/CompilerDriver/Tool.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/Interpreter/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/ExecutionEngine/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Linker/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Linker/LinkArchives.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Linker/LinkItems.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Linker/LinkModules.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Linker/Linker.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Linker/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCAsmInfo.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCAsmStreamer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCAssembler.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCCodeEmitter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCContext.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCDisassembler.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCExpr.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCInst.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCInstPrinter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCLabel.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCLoggingStreamer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCMachOStreamer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCNullStreamer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCObjectWriter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCSection.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCSectionCOFF.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCSectionELF.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCSectionMachO.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCStreamer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCSymbol.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MCValue.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/MachObjectWriter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/MC/TargetAsmBackend.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/APFloat.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/APInt.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/APSInt.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Allocator.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/COPYRIGHT.regex#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/CommandLine.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/ConstantRange.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Debug.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/DeltaAlgorithm.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Dwarf.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/ErrorHandling.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/FileUtilities.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/FoldingSet.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/FormattedStream.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/GraphWriter.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/IsInf.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/IsNAN.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/ManagedStatic.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/MemoryBuffer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/MemoryObject.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/PluginLoader.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/PrettyStackTrace.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Regex.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/SlowOperationInformer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/SmallPtrSet.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/SmallVector.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/SourceMgr.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Statistic.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/StringExtras.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/StringMap.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/StringPool.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/StringRef.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/SystemUtils.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/TargetRegistry.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Timer.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Triple.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/Twine.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/circular_raw_ostream.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/raw_os_ostream.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/raw_ostream.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regcclass.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regcname.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regcomp.c#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regengine.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regerror.c#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regex2.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regex_impl.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regexec.c#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regfree.c#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regstrlcpy.c#1 branch .. //depot/projects/hammer/contrib/llvm/lib/Support/regutils.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Alarm.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Atomic.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/CMakeLists.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Disassembler.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/DynamicLibrary.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Errno.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Host.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/IncludeFile.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Makefile#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Memory.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Mutex.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Path.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Process.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Program.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/README.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/RWMutex.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/SearchForAddressOfSpecialSymbol.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Signals.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/ThreadLocal.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Threading.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/TimeValue.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Alarm.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Host.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Memory.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Mutex.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Path.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Process.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Program.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/README.txt#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/RWMutex.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Signals.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/ThreadLocal.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/TimeValue.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Unix/Unix.h#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Valgrind.cpp#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Win32/Alarm.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Win32/DynamicLibrary.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Win32/Host.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Win32/Memory.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Win32/Mutex.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Win32/Path.inc#1 branch .. //depot/projects/hammer/contrib/llvm/lib/System/Win32/Process.inc#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 21 21:04:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E98931065677; Mon, 21 Jun 2010 21:04:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADF34106564A for ; Mon, 21 Jun 2010 21:04:13 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 828588FC15 for ; Mon, 21 Jun 2010 21:04:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LL4DhJ086008 for ; Mon, 21 Jun 2010 21:04:13 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LL4DNF086006 for perforce@freebsd.org; Mon, 21 Jun 2010 21:04:13 GMT (envelope-from peter@wemm.org) Date: Mon, 21 Jun 2010 21:04:13 GMT Message-Id: <201006212104.o5LL4DNF086006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 21:04:14 -0000 http://p4web.freebsd.org/@@180049?ac=10 Change 180049 by peter@peter_daintree on 2010/06/21 21:03:57 Fix the short version Affected files ... .. //depot/projects/hammer/lib/libutil/kld.c#4 edit Differences ... ==== //depot/projects/hammer/lib/libutil/kld.c#4 (text) ==== @@ -38,7 +38,7 @@ int kld_isloaded(const char *name) { - if (modstat(name) != -1 || kldfind(name) != -1) + if (modfind(name) != -1 || kldfind(name) != -1) return (1); return (0); } From owner-p4-projects@FreeBSD.ORG Mon Jun 21 21:37:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1112A106566C; Mon, 21 Jun 2010 21:37:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C99A3106566B for ; Mon, 21 Jun 2010 21:37:50 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE6C98FC1B for ; Mon, 21 Jun 2010 21:37:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LLboZS088486 for ; Mon, 21 Jun 2010 21:37:50 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LLboGR088484 for perforce@freebsd.org; Mon, 21 Jun 2010 21:37:50 GMT (envelope-from afiveg@FreeBSD.org) Date: Mon, 21 Jun 2010 21:37:50 GMT Message-Id: <201006212137.o5LLboGR088484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 21:37:51 -0000 http://p4web.freebsd.org/@@180051?ac=10 Change 180051 by afiveg@cottonmouth on 2010/06/21 21:36:51 Porting ringmap to current "em". Interruots and mmory mapping work correctly. Affected files ... .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#8 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#6 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#4 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#10 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#10 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#1 add .. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#2 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#2 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#2 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/test#2 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#3 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#8 (text+ko) ==== @@ -3567,11 +3567,14 @@ } if (accept_frame) { + +#ifndef RINGMAP + /* Do not allocate memory for new mbufs and packets. Work in ring */ if (lem_get_buf(adapter, i) != 0) { ifp->if_iqdrops++; goto discard; } - +#endif /* Assign correct length to the current fragment */ mp->m_len = len; @@ -3629,7 +3632,9 @@ } } else { ifp->if_ierrors++; +#ifndef RINGMAP discard: +#endif /* Reuse loaded DMA map and just update mbuf chain */ mp = adapter->rx_buffer_area[i].m_head; mp->m_len = mp->m_pkthdr.len = MCLBYTES; @@ -3657,9 +3662,13 @@ /* Call into the stack */ if (m != NULL) { adapter->next_rx_desc_to_check = i; + +#ifndef RINGMAP +/* Do not send packet to the IP-stack */ EM_RX_UNLOCK(adapter); (*ifp->if_input)(ifp, m); EM_RX_LOCK(adapter); +#endif rx_sent++; i = adapter->next_rx_desc_to_check; } @@ -3670,7 +3679,12 @@ /* Advance the E1000's Receive Queue #0 "Tail Pointer". */ if (--i < 0) i = adapter->num_rx_desc - 1; + +#ifndef RINGMAP + /* Tail pointer will be with userrp synchronized */ E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), i); +#endif + EM_RX_UNLOCK(adapter); return (rx_sent); } ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#6 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#4 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#10 (text+ko) ==== @@ -355,26 +355,35 @@ atomic_readandclear_int(&rm->open_cnt); RINGMAP_FUNC_DEBUG(end); + return (0); } + int -ringmap_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, +ringmap_mmap(struct cdev *cdev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr) { -// struct adapter *adapter = (struct adapter *)get_adapter_struct(dev); -// struct ringmap *rm = adapter->rm; -// + struct ringmap *rm = NULL; + RINGMAP_FUNC_DEBUG(start); -// -// if (nprot & PROT_EXEC) { -// RINGMAP_WARN("PROT_EXEC ist set"); -// return (ERESTART); -// } -// -// /* We want to map ring in user-space. offset is not needed! */ -// offset = 0; -// *paddr = vtophys((rm->ring) + offset); + + rm = get_ringmap_p(get_device_p(cdev)); + + if (rm == NULL){ + RINGMAP_ERROR(Can not get pointer to ringmap structure); + return (ENXIO); + } + if (rm->ring == NULL){ + RINGMAP_ERROR(Can not get pointer to ring structure); + return (ENXIO); + } + if (nprot & PROT_EXEC) { + RINGMAP_WARN("PROT_EXEC ist set"); + return (ERESTART); + } + + *paddr = vtophys(rm->ring); RINGMAP_FUNC_DEBUG(end); @@ -576,27 +585,3 @@ // (unsigned int) rm->ring->slot[slot_number].packet.kern); // printf(" \n"); //} -// -// -//int -//ringmap_print_ring_pointers(struct adapter *adapter) -//{ -// unsigned int rdt, rdh; -// struct ringmap *rm = adapter->rm; -// -// rdh = RINGMAP_HW_READ_HEAD(adapter); -// rdt = RINGMAP_HW_READ_TAIL(adapter); -// -// printf("\n +++++++++ RING POINTERS ++++++++++++ \n"); -// printf(" + RDH = %d (KERN POINTER)\n", rdh); -// printf(" + RDT = %d (USER POINTER)\n", rdt); -// printf(" +\n"); -// printf(" + kernrp = %d \n", rm->ring->kernrp); -// printf(" + userrp = %d \n", rm->ring->userrp); -// printf(" ++++++++++++++++++++++++++++++++++++++ \n\n"); -// -// return (0); -//} - - - ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#10 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#2 (text+ko) ==== @@ -4,8 +4,9 @@ int main () { - // rm_mmap(); - rm_close(rm_open()); + int fd = rm_open(); + rm_mmap(fd); + rm_close(fd); return (0); } ==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#2 (text+ko) ==== @@ -1,0 +1,51 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + + + +#include "ringmap.h" + +int +rm_mmap(int fd) +{ + void *addr; + struct ring *r; + + addr = mmap(0, sizeof(struct ring), + PROT_WRITE|PROT_READ, MAP_SHARED, fd, 0); + if (addr == MAP_FAILED){ + printf("mapping failed \n"); + return (-1); + } + + r = (struct ring *)addr; + + printf("Size of ring = %d \n", r->size); + + return (0); +} ==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ #include #include +#include #include "tests.h" /* @@ -14,5 +15,6 @@ if (fd < 0) perror("Error while opening device! "); + // sleep(20); return (fd); } ==== //depot/projects/soc2010/ringmap/tests/ringmap/test#2 (text+ko) ==== @@ -1,8 +1,10 @@ -ELF ---╤┐ю└рt─З/uЯё√╤┐ю└рuЛ╦,√┘юt4▀E┴$ХNЪЪЪг$L┘ХBЪЪЪХыЧЪЪ┴|$┴\$┴4$Х≥--┐┐*┐:┐J┐Z┐--\ No newline at end of file +ELF +++╤┐ю└рt─З/uЯёt≈╤┐ю└рuЛ╦└≈┘юt4▀E┴$ХVЪЪЪг$|├ХJЪЪЪХ╠ЧЪЪ┴|$┴\$┴4$Х≥+┤Х╜ЩЪЪ▀EЭиц░░░░░░░░░░░░U┴ЕS┐Л║4≤┐ЬЪt1шЪп▀┐0≤┐К┐ЬЪuП┐д[]ц░░░┐Л Х<ЧЪЪ┐д ц+++++\ No newline at end of file ==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#3 (text+ko) ==== @@ -3,4 +3,4 @@ int rm_open(void); int rm_close(int); -int rm_mmap(void); +int rm_mmap(int); From owner-p4-projects@FreeBSD.ORG Mon Jun 21 23:47:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADE89106567E; Mon, 21 Jun 2010 23:47:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 727B8106567B for ; Mon, 21 Jun 2010 23:47:13 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FB408FC16 for ; Mon, 21 Jun 2010 23:47:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LNlDAV000551 for ; Mon, 21 Jun 2010 23:47:13 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LNlC5q000549 for perforce@freebsd.org; Mon, 21 Jun 2010 23:47:12 GMT (envelope-from bfiedler@FreeBSD.org) Date: Mon, 21 Jun 2010 23:47:12 GMT Message-Id: <201006212347.o5LNlC5q000549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 23:47:14 -0000 http://p4web.freebsd.org/@@180060?ac=10 Change 180060 by bfiedler@freebsd-7803 on 2010/06/21 23:47:06 Merge my missing additions(help, tabsize, 'y') to Gabor's branch Affected files ... .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#2 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#2 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#2 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/pathnames.h#2 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#2 (text+ko) ==== @@ -44,9 +44,10 @@ #include #include "diff.h" +#include "pathnames.h" int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; -int sflag, tflag, Tflag, wflag, uniflag, strip_cr; +int sflag, tflag, Tflag, wflag, uniflag, yflag, strip_cr, tabsize=8; int format, status; int fcase_behave = FCASE_SENSITIVE; unsigned long long context; @@ -64,17 +65,26 @@ TOFILE_OPT, UNIDIR_OPT, STRIPCR_OPT, - NOOP_OPT + NOOP_OPT, + + LEFTC_OPT, + SUPCL_OPT, + GTYPE_OPT, + LF_OPT, + LLF_OPT, + TSIZE_OPT, + HLINES_OPT, + OPT_LFILES, }; -#define OPTIONS "0123456789abBC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:" + +#define OPTIONS "0123456789abBC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:y" static struct option longopts[] = { { "ignore-file-name-case", no_argument, NULL, FCASE_IGNORE_OPT }, { "no-ignore-file-name-case", no_argument, NULL, FCASE_SENSITIVE_OPT }, { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT }, { "normal", no_argument, NULL, NORMAL_OPT }, -/* XXX: UNIMPLEMENTED - { "tabsize", optional_argument, NULL, OPT_TSIZE }, */ + { "tabsize", optional_argument, NULL, TSIZE_OPT }, { "unidirectional-new-file", no_argument, NULL, UNIDIR_OPT }, { "from-file", required_argument, NULL, FROMFILE_OPT }, { "to-file", required_argument, NULL, TOFILE_OPT }, @@ -109,6 +119,8 @@ { "exclude-from", required_argument, NULL, 'X' }, { "exclude", required_argument, NULL, 'x' }, { "speed-large-files", no_argument, NULL, NOOP_OPT }, + + { "side-by-side", no_argument, NULL, 'y' }, /* XXX: the following are not very well documented and rarely used. If we need them at all, we will need to dig into the code to see what do they do actually. @@ -130,6 +142,16 @@ { NULL, 0, NULL, '\0'} }; +static const char *help_msg[] = { +"-a --text treat files as ASCII text", +"-B --ignore-blank-lines Ignore blank newlines in the comparison", +"-b --ignore-space-change Ignore all changes due to whitespace", +"-C NUM --context=[NUM] Show NUM lines before and after change (default 3)", +"-D --ifdef=NAME", +NULL, +}; +char **help_strs = (char **)help_msg; + void usage(void); void push_excludes(char *); void push_ignore_pats(char *); @@ -140,11 +162,12 @@ main(int argc, char **argv) { char *ep, *fromfile = NULL, *tofile = NULL, **oargv, *src, *dst; - int ch, lastch, gotstdin, prevoptind, newarg, flags = 0; + int ch, lastch, gotstdin, prevoptind, newarg, oargc, flags = 0; setlocale(LC_ALL, ""); oargv = argv; + oargc = argc; gotstdin = 0; lastch = '\0'; @@ -266,6 +289,9 @@ case 'x': push_excludes(optarg); break; + case 'y': + yflag = 1; + break; case FROMFILE_OPT: if (tofile != NULL) err(2, "--from-file and --to-file are both specified"); @@ -288,6 +314,15 @@ case STRIPCR_OPT: strip_cr = 1; break; + case TSIZE_OPT: + if (optarg != NULL) { + context = strtol(optarg, &ep, 10); + if (*ep != '\0' || context < 1 || context >=ULLONG_MAX) + err(2, "context out of range\n"); + tabsize = (int)context; + } else + tabsize = 8; + break; case NOOP_OPT: /* noop, compatibility */ break; @@ -296,7 +331,11 @@ break; case HELP_OPT: default: - usage(); + for(;*help_strs;help_strs++) + { + printf( "%s\n", *help_strs); + } + exit(2); break; } lastch = ch; @@ -305,6 +344,20 @@ } argc -= optind; argv += optind; + + if(yflag) { + /* remove y flag from args and call sdiff */ + for(argv=oargv; argv && strcmp(*argv, "-y") != 0; argv++); + while(argv != &oargv[oargc]){ + *argv=*(argv+1); + argv++; + } + oargv[0] = _PATH_SDIFF; + *argv= "\0"; + + execv(_PATH_SDIFF, oargv); + _exit(127); + } /* * Do sanity checks, fill in stb1 and stb2 and call the appropriate ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#2 (text+ko) ==== @@ -83,7 +83,7 @@ }; extern int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, - sflag, tflag, Tflag, wflag, uniflag, strip_cr; + sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize; extern int format, status; extern int fcase_behave; extern unsigned long long context; ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#2 (text+ko) ==== @@ -1080,6 +1080,7 @@ fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile) { int i, j, c, lastc, col, nc; + int newcol; /* * When doing #ifdef's, copy down to current line @@ -1128,9 +1129,10 @@ return (0); } if (c == '\t' && tflag) { + newcol = ((col/tabsize)+1)*tabsize; do { - putchar(' '); - } while (++col & 7); + putwchar(L' '); + } while (++col < newcol); } else { if (format == D_EDIT && j == 1 && c == '\n' && lastc == '.') { ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/pathnames.h#2 (text+ko) ==== @@ -23,3 +23,4 @@ #include #define _PATH_PR "/usr/bin/pr" +#define _PATH_SDIFF "/usr/bin/sdiff" From owner-p4-projects@FreeBSD.ORG Tue Jun 22 00:45:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C89741065674; Tue, 22 Jun 2010 00:45:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CCCA1065673 for ; Tue, 22 Jun 2010 00:45:18 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7AF0A8FC12 for ; Tue, 22 Jun 2010 00:45:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M0jIWg006275 for ; Tue, 22 Jun 2010 00:45:18 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5M0jIox006273 for perforce@freebsd.org; Tue, 22 Jun 2010 00:45:18 GMT (envelope-from bfiedler@FreeBSD.org) Date: Tue, 22 Jun 2010 00:45:18 GMT Message-Id: <201006220045.o5M0jIox006273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 00:45:19 -0000 http://p4web.freebsd.org/@@180076?ac=10 Change 180076 by bfiedler@freebsd-7803 on 2010/06/22 00:44:34 Fix compile warnings Affected files ... .. //depot/projects/soc2010/bsdtextproc/sdiff/common.h#3 edit .. //depot/projects/soc2010/bsdtextproc/sdiff/edit.c#2 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/sdiff/common.h#3 (text+ko) ==== @@ -6,7 +6,7 @@ */ #ifdef __FreeBSD__ -#include "gnuc.h" +#define __dead #endif __dead void cleanup(const char *); ==== //depot/projects/soc2010/bsdtextproc/sdiff/edit.c#2 (text+ko) ==== @@ -146,7 +146,7 @@ len = strlen(text); if ((nwritten = write(fd, text, len)) == -1 || - nwritten != len) { + (size_t)nwritten != len) { warn("error writing to temp file"); cleanup(filename); } From owner-p4-projects@FreeBSD.ORG Tue Jun 22 01:36:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D44821065672; Tue, 22 Jun 2010 01:36:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80AED106566C for ; Tue, 22 Jun 2010 01:36:15 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 66D1F8FC17 for ; Tue, 22 Jun 2010 01:36:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M1aFvQ022027 for ; Tue, 22 Jun 2010 01:36:15 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5M1aFr8022025 for perforce@freebsd.org; Tue, 22 Jun 2010 01:36:15 GMT (envelope-from bfiedler@FreeBSD.org) Date: Tue, 22 Jun 2010 01:36:15 GMT Message-Id: <201006220136.o5M1aFr8022025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180087 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 01:36:16 -0000 http://p4web.freebsd.org/@@180087?ac=10 Change 180087 by bfiedler@freebsd-7803 on 2010/06/22 01:36:13 Add --horizon-lines option Affected files ... .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#3 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#3 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#3 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#3 (text+ko) ==== @@ -48,6 +48,7 @@ int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; int sflag, tflag, Tflag, wflag, uniflag, yflag, strip_cr, tabsize=8; +int horizon; int format, status; int fcase_behave = FCASE_SENSITIVE; unsigned long long context; @@ -65,6 +66,7 @@ TOFILE_OPT, UNIDIR_OPT, STRIPCR_OPT, + HORIZ_OPT, NOOP_OPT, LEFTC_OPT, @@ -89,6 +91,7 @@ { "from-file", required_argument, NULL, FROMFILE_OPT }, { "to-file", required_argument, NULL, TOFILE_OPT }, { "help", no_argument, NULL, HELP_OPT }, + { "horizon-lines", required_argument, NULL, HORIZ_OPT}, { "text", no_argument, NULL, 'a' }, { "ignore-blank-lines", no_argument, NULL, 'B' }, { "ignore-space-change", no_argument, NULL, 'b' }, @@ -124,7 +127,6 @@ /* XXX: the following are not very well documented and rarely used. If we need them at all, we will need to dig into the code to see what do they do actually. - { "horizon-lines", required_argument, NULL, NOOP_OPT }, { "left-column", no_argument, NULL, NOOP_OPT }, { "line-format", required_argument, NULL, NOOP_OPT }, { "show-function-line", required_argument, NULL, 'F' }, @@ -323,6 +325,15 @@ } else tabsize = 8; break; + case HORIZ_OPT: + if (optarg != NULL) { + context = strtol(optarg, &ep, 10); + if (*ep != '\0' || context < 1 || context >=ULLONG_MAX) + err(2, "context out of range\n"); + horizon= (int)context; + } + break; + case NOOP_OPT: /* noop, compatibility */ break; ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#3 (text+ko) ==== @@ -84,7 +84,7 @@ extern int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize; -extern int format, status; +extern int format, status, horizon; extern int fcase_behave; extern unsigned long long context; extern char *start, *ifdefname, *diffargs, *label[2], *ignore_pats; ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#3 (text+ko) ==== @@ -529,6 +529,12 @@ file[0][len[0] - suff].value == file[1][len[1] - suff].value; suff++) ; + + if(horizon) { + suff = (suff - horizon) < 0 ? 0 : suff - horizon; + pref = (pref - horizon) < 0 ? 0 : pref - horizon; + } + for (j = 0; j < 2; j++) { sfile[j] = file[j] + pref; slen[j] = len[j] - pref - suff; From owner-p4-projects@FreeBSD.ORG Tue Jun 22 06:34:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B23F1065675; Tue, 22 Jun 2010 06:34:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9499A106564A for ; Tue, 22 Jun 2010 06:34:42 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78D258FC18 for ; Tue, 22 Jun 2010 06:34:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M6Ygk0060369 for ; Tue, 22 Jun 2010 06:34:42 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5M6Ygts060367 for perforce@freebsd.org; Tue, 22 Jun 2010 06:34:42 GMT (envelope-from ligregni@FreeBSD.org) Date: Tue, 22 Jun 2010 06:34:42 GMT Message-Id: <201006220634.o5M6Ygts060367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 06:34:43 -0000 http://p4web.freebsd.org/@@180091?ac=10 Change 180091 by ligregni@ligPhenom on 2010/06/22 06:34:14 Client socket connection done, ready to start master daemon (mainly to test the shipd daemon). Affected files ... .. //depot/projects/soc2010/disaudit/damasterd.c#1 add .. //depot/projects/soc2010/disaudit/damasterd.h#1 add .. //depot/projects/soc2010/disaudit/msocket_work.c#1 add .. //depot/projects/soc2010/disaudit/msocket_work.h#1 add .. //depot/projects/soc2010/disaudit/ssocket_work.c#2 edit .. //depot/projects/soc2010/disaudit/ssocket_work.h#2 edit Differences ... ==== //depot/projects/soc2010/disaudit/ssocket_work.c#2 (text+ko) ==== @@ -25,8 +25,102 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + int do_socket_check_file(char *host, int port, char *path, char *fullpath, char *md5) { + int sockfd; + + if (init_socket(host, port, &sockfd) == -1) + return -1; + return -1; } + +int +is_ipv4(char *address) +{ + int points=0, last_point=0, i, len=strlen(address); + + /* Here we will check if the string is a valid IPv4 address */ + + for(i=0; i last_point+1) /* Counting the points and making sure there are no two consecutive points */ + { + last_point = i; + ++points; + } + else if (!isdigit(address[i])) + break; + + if (points == 3 && i == len) + return 1; + return 0; +} + +int +init_socket(char *host, int port, int *sfd) +{ + struct sockaddr_in sockaddr; + struct in_addr inaddr; + struct hostent *hostentry = NULL; + char message[256]; + int sockfd, res; + char ipv4[16]; + + if (!is_ipv4(host)) + { + hostentry = gethostbyname(host); + if (!hostentry) + { + to_log("Error gettig the host"); + return -1; + } + + sprintf(message, "Got for the host: %s the IPv4 address: %s", host, inet_ntoa(*((struct in_addr *)hostentry->h_addr))); + to_log(message); + } + + sockfd = socket(PF_INET, SOCK_STREAM, 0); + + if (sockfd == -1) + { + to_log("Cannot create socket!"); + return -1; + } + + bzero(&sockaddr, sizeof(sockaddr)); + + sockaddr.sin_family = AF_INET; + sockaddr.sin_addr.s_addr = hostentry != NULL ? ((struct in_addr *) hostentry->h_addr)->s_addr : inet_addr(host); + sockaddr.sin_port = htons(port); + + res = connect(sockfd, (struct sockaddr *) &sockaddr, sizeof(sockaddr)); + + if (res < 0) + { + to_log("Can't connect to server!"); + return -1; + } + + sprintf(message, "Successfully connected to: %s", hostentry != NULL ? inet_ntoa(*((struct in_addr *) hostentry->h_addr)) : host); + to_log(message); + + *sfd = sockfd; + return 0; +} + ==== //depot/projects/soc2010/disaudit/ssocket_work.h#2 (text+ko) ==== @@ -29,5 +29,6 @@ #define _SSOCKET_WORK_H_ int do_socket_check_file(char *, int, char *, char *, char *); +int init_socket(char *, int, int *); #endif From owner-p4-projects@FreeBSD.ORG Tue Jun 22 06:35:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07D341065672; Tue, 22 Jun 2010 06:35:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0BE7106566B for ; Tue, 22 Jun 2010 06:35:43 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE20F8FC14 for ; Tue, 22 Jun 2010 06:35:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M6ZhOB060495 for ; Tue, 22 Jun 2010 06:35:43 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5M6Zhvd060493 for perforce@freebsd.org; Tue, 22 Jun 2010 06:35:43 GMT (envelope-from ligregni@FreeBSD.org) Date: Tue, 22 Jun 2010 06:35:43 GMT Message-Id: <201006220635.o5M6Zhvd060493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 06:35:44 -0000 http://p4web.freebsd.org/@@180092?ac=10 Change 180092 by ligregni@ligPhenom on 2010/06/22 06:34:49 A makefile with more options Affected files ... .. //depot/projects/soc2010/disaudit/Makefile#2 edit Differences ... ==== //depot/projects/soc2010/disaudit/Makefile#2 (text+ko) ==== @@ -1,3 +1,13 @@ +all: shipd.c ssocket_work.c damasterd.c msocket_work.c + make shipd + make damasterd + +damasterd: damasterd.c msocket_work.c + cc -lmd -o damasterd damasterd.c msocket_work.c + shipd: shipd.c ssocket_work.c cc -lmd -o shipd shipd.c ssocket_work.c +debug: shipd.c ssocket_work.c + cc -g -lmd -o shipd shipd.c ssocket_work.c + cc -g -lmd -o damasterd damasterd.c msocket_work.c From owner-p4-projects@FreeBSD.ORG Tue Jun 22 06:47:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 078E21065673; Tue, 22 Jun 2010 06:47:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C05131065670 for ; Tue, 22 Jun 2010 06:47:37 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 74F5F8FC16 for ; Tue, 22 Jun 2010 06:47:37 +0000 (UTC) Received: by iwn7 with SMTP id 7so5354447iwn.13 for ; Mon, 21 Jun 2010 23:47:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=+3W8TKj7BbNog/VwKTmiYYS52XMsRqYE09ZdcYKbfJM=; b=O5r2Sa0AYVp+mOscOnBLjmK33c1u2ULB2PxhEAgAc6FffiW9ktdM64+JkNdbuyqewT fOrX/JZbwLaiDFc5dJL9BQBryl3r6GlYPwXwR/EPcpwnN+WeS8RzbAPoE2shoTLBZZlb FIi7Qi219jy4VRt90KFibuxc5xxpyJ+318eDY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=CGKFALSSGUNLYsBfnjRIIkNedz31ylHhDG0uBY0iAA5Y74b4kpUM4UPV3RcwiV244E 2pOck5PcbTrcUfHTw78lugB46n9w06DJgxtnbtq+b/ZFOK9WmQ4DT38PjXp6UBruJVt7 w3SihI6OpvDmzCJ1KGJrkKcxzmBBq34xCoAWg= MIME-Version: 1.0 Received: by 10.231.150.1 with SMTP id w1mr7259637ibv.7.1277189256564; Mon, 21 Jun 2010 23:47:36 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.117.201 with HTTP; Mon, 21 Jun 2010 23:47:35 -0700 (PDT) In-Reply-To: <201006220635.o5M6Zhvd060493@repoman.freebsd.org> References: <201006220635.o5M6Zhvd060493@repoman.freebsd.org> Date: Mon, 21 Jun 2010 23:47:35 -0700 X-Google-Sender-Auth: GToyusKmIGV8PGCAr6cywy8G0RY Message-ID: From: Garrett Cooper To: Sergio Ligregni Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 180092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 06:47:38 -0000 On Mon, Jun 21, 2010 at 11:35 PM, Sergio Ligregni wr= ote: > http://p4web.freebsd.org/@@180092?ac=3D10 > > Change 180092 by ligregni@ligPhenom on 2010/06/22 06:34:49 > > =A0 =A0 =A0 =A0A makefile with more options > > Affected files ... > > .. //depot/projects/soc2010/disaudit/Makefile#2 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/soc2010/disaudit/Makefile#2 (text+ko) =3D= =3D=3D=3D > > @@ -1,3 +1,13 @@ > +all: shipd.c ssocket_work.c damasterd.c msocket_work.c > + =A0 =A0 =A0 make shipd > + =A0 =A0 =A0 make damasterd > + > +damasterd: damasterd.c msocket_work.c > + =A0 =A0 =A0 cc -lmd -o damasterd damasterd.c msocket_work.c > + > =A0shipd: shipd.c ssocket_work.c > =A0 =A0 =A0 =A0cc -lmd -o shipd shipd.c ssocket_work.c > > +debug: shipd.c ssocket_work.c > + =A0 =A0 =A0 cc -g -lmd -o shipd shipd.c ssocket_work.c > + =A0 =A0 =A0 cc -g -lmd -o damasterd damasterd.c msocket_work.c Hi Sergio, Please read make(1) and style.make(9). It will help in terms of developing proper FreeBSD style Makefiles. Thanks, -Garrett From owner-p4-projects@FreeBSD.ORG Tue Jun 22 08:09:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 613891065674; Tue, 22 Jun 2010 08:09:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 243B81065672 for ; Tue, 22 Jun 2010 08:09:26 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10F498FC15 for ; Tue, 22 Jun 2010 08:09:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M89QpQ069616 for ; Tue, 22 Jun 2010 08:09:26 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5M89QsF069614 for perforce@freebsd.org; Tue, 22 Jun 2010 08:09:26 GMT (envelope-from gk@FreeBSD.org) Date: Tue, 22 Jun 2010 08:09:26 GMT Message-Id: <201006220809.o5M89QsF069614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 08:09:26 -0000 http://p4web.freebsd.org/@@180094?ac=10 Change 180094 by gk@gk_h1 on 2010/06/22 08:09:25 Change API dropping dircache_*update(), use granular entry locking Affected files ... .. //depot/projects/soc2010/gk_namecache/sys/fs/pefs/pefs.h#2 edit .. //depot/projects/soc2010/gk_namecache/sys/fs/pefs/pefs_subr.c#2 edit .. //depot/projects/soc2010/gk_namecache/sys/fs/pefs/pefs_vfsops.c#2 edit .. //depot/projects/soc2010/gk_namecache/sys/fs/pefs/pefs_vnops.c#2 edit .. //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_subr.c#3 edit .. //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_vnops.c#3 edit .. //depot/projects/soc2010/gk_namecache/sys/kern/vfs_dircache.c#3 edit .. //depot/projects/soc2010/gk_namecache/sys/sys/dircache.h#3 edit Differences ... ==== //depot/projects/soc2010/gk_namecache/sys/fs/pefs/pefs.h#2 (text+ko) ==== @@ -103,7 +103,10 @@ }; #define PM_ROOT_CANRECURSE 0x01 -#define PM_DIRCACHE 0x02 +#define PM_DIRCACHE_NAMECACHE 0x02 +#define PM_DIRCACHE_VATTR 0x04 + +#define PM_DIRCACHE (PM_DIRCACHE_NAMECACHE | PM_DIRCACHE_VATTR) struct pefs_mount { struct mount *pm_lowervfs; ==== //depot/projects/soc2010/gk_namecache/sys/fs/pefs/pefs_subr.c#2 (text+ko) ==== @@ -68,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -253,6 +254,11 @@ int buflen = *encname_len; ASSERT_VOP_LOCKED(lvp, "pefs_node_lookup_name"); + + error = dircache_getname(lvp, encname, encname_len); + if (error == 0) + goto out; + locked = VOP_ISLOCKED(lvp); if (ldvp) { dlocked = VOP_ISLOCKED(ldvp); @@ -276,6 +282,7 @@ if (error) return (ENOENT); +out: memcpy(encname, encname + *encname_len, buflen - *encname_len); *encname_len = buflen - *encname_len; if (*encname_len < buflen) ==== //depot/projects/soc2010/gk_namecache/sys/fs/pefs/pefs_vfsops.c#2 (text+ko) ==== @@ -46,6 +46,10 @@ #include +static const char *pefs_dircache_support_vattr[] = { + "zfs", NULL +}; + static MALLOC_DEFINE(M_PEFSMNT, "pefs_mount", "PEFS mount structure"); static const char *pefs_opts[] = { @@ -55,24 +59,35 @@ static void dircache_init(struct mount *mp, int opt, struct pefs_mount *pm) { + struct mount *lmp; char *lowerfs; - int supported; + const char **support_vattr; + int support; + + if (opt == 0) + return; - lowerfs = mp->mnt_vnodecovered->v_mount->mnt_vfc->vfc_name; - supported = (strcmp(lowerfs, "zfs") == 0 || - strcmp(lowerfs, "tmpfs") == 0); - if (opt < 0) - opt = supported; - else if (opt > 0 && supported == 0) { + support = 0; + lmp = mp->mnt_vnodecovered->v_mount; + lowerfs = lmp->mnt_vfc->vfc_name; + for (support_vattr = pefs_dircache_support_vattr; + *support_vattr != NULL; support_vattr++) + if (strcmp(lowerfs, *support_vattr) == 0) { + support |= PM_DIRCACHE_VATTR; + break; + } + MNT_ILOCK(lmp); + if ((lmp->mnt_kern_flag & MNTK_DIRCACHE) != 0) + support |= PM_DIRCACHE_NAMECACHE; + MNT_IUNLOCK(lmp); + if (opt > 0 && support == 0) { printf("pefs: dircache is not supported by filesystem: %s\n", lowerfs); opt = 0; } - if (opt == 0) - pm->pm_flags &= ~PM_DIRCACHE; - else - pm->pm_flags |= PM_DIRCACHE; + if (opt != 0) + pm->pm_flags |= support; PEFSDEBUG("pefs_mount: dircache %s\n", (opt ? "enabled" : "disabed")); } ==== //depot/projects/soc2010/gk_namecache/sys/fs/pefs/pefs_vnops.c#2 (text+ko) ==== @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -105,6 +106,13 @@ struct vattr va; int error; + /* Prefer PM_DIRCACHE_VATTR */ + if ((VFS_TO_PEFS(vp->v_mount)->pm_flags & PM_DIRCACHE) == + PM_DIRCACHE_NAMECACHE) { + va.va_gen = dircache_getgen(vp); + if (va.va_gen != 0) + return (va.va_gen); + } error = VOP_GETATTR(PEFS_LOWERVP(vp), &va, cred); if (error != 0) return (0); ==== //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_subr.c#3 (text+ko) ==== @@ -401,6 +401,8 @@ error = insmntque(vp, mp); if (error) vp = NULL; + else + dircache_allocvnode(vp, node->tn_id); unlock: TMPFS_NODE_LOCK(node); @@ -520,8 +522,7 @@ * insert the new node into the directory, an operation that * cannot fail. */ tmpfs_dir_attach(dvp, de); - dircache_add(dvp, *vpp, cnp, DT_STRONG, node->tn_id, - tmpfs_dircookie(de)); + dircache_add(dvp, *vpp, cnp, DT_STRONG, node->tn_id); out: @@ -588,8 +589,7 @@ tmpfs_dir_lookup(struct tmpfs_node *node, struct tmpfs_node *f, struct componentname *cnp) { - struct dircache_cursor curs; - boolean_t found, cache; + boolean_t found; struct tmpfs_dirent *de; MPASS(IMPLIES(cnp->cn_namelen == 1, cnp->cn_nameptr[0] != '.')); @@ -599,25 +599,16 @@ found = 0; - cache = dircache_beginupdate(&curs, node->tn_vnode, cnp, - DC_OP_IFPARTIAL) == 0; TAILQ_FOREACH(de, &node->tn_dir.tn_dirhead, td_entries) { - if (cache) - dircache_update(&curs, DT_STRONG, de->td_name, - de->td_namelen, de->td_node->tn_id, - tmpfs_dircookie(de)); if (f != NULL && de->td_node != f) continue; MPASS(cnp->cn_namelen < 0xffff); if (de->td_namelen == (uint16_t)cnp->cn_namelen && bcmp(de->td_name, cnp->cn_nameptr, de->td_namelen) == 0) { found = 1; - if (!cache) - break; + break; } } - if (cache) - dircache_completeupdate(&curs); node->tn_status |= TMPFS_NODE_ACCESSED; return found ? de : NULL; ==== //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_vnops.c#3 (text+ko) ==== @@ -913,7 +913,7 @@ /* Insert the new directory entry into the appropriate directory. */ tmpfs_dir_attach(dvp, de); - dircache_add(dvp, vp, cnp, DT_STRONG, node->tn_id, tmpfs_dircookie(de)); + dircache_add(dvp, vp, cnp, DT_STRONG, node->tn_id); /* vp link count has changed, so update node times. */ node->tn_status |= TMPFS_NODE_CHANGED; @@ -1138,7 +1138,7 @@ tmpfs_free_dirent(VFS_TO_TMPFS(tvp->v_mount), de, TRUE); } - dircache_rename(fdvp, fvp, fcnp, tdvp, tvp, tcnp); + dircache_rename(fdvp, fcnp, tdvp, tcnp); error = 0; ==== //depot/projects/soc2010/gk_namecache/sys/kern/vfs_dircache.c#3 (text+ko) ==== @@ -49,19 +49,16 @@ #include -#define DCDEBUG(format, args...) \ +#define DC_NAMEROUND 16 /* power of 2 */ + +#define DC_OP_VLOCK 0x00000001 + +#define DCDEBUG(format, args...) \ do { \ if (dircache_debug != 0) \ printf(format ,## args); \ } while (0) -#define DIRCACHE_STAT(n, descr) \ - SYSCTL_PROC(_vfs_dircache, OID_AUTO, n, \ - CTLFLAG_RD | CTLTYPE_ULONG | CTLFLAG_MPSAFE, \ - NULL, __CONCAT(dps_, n), dps_sysctlhandler, "LU", descr) - -#define DC_NAMEROUND 16 /* power of 2 */ - enum { dps_interlock_same, dps_interlock_direct, @@ -70,18 +67,10 @@ dps_max }; -struct nspace; - struct dircache_poolstat { u_long dps_stats[dps_max]; }; -struct dircache_pool { - struct mtx dp_mtx; - u_long dp_gen; - struct dircache_poolstat dp_stat; -}; - struct dircache_root { struct mount *dr_mnt; struct dircache *dr_entry; @@ -91,120 +80,26 @@ static MALLOC_DEFINE(M_DIRCACHE, "dircache buf", "dircache buffers"); static uma_zone_t dircache_zone; -static struct dircache_pool **pool; -static size_t pool_size; -static u_long pool_id; -static char **pool_mtxname; -static const int pool_mtxnamesz = 20; - static int dircache_debug = 1; SYSCTL_UINT(_vfs_dircache, OID_AUTO, debug, CTLFLAG_RW, &dircache_debug, 0, "Enable debug"); -static int dps_sysctlhandler(SYSCTL_HANDLER_ARGS); - -DIRCACHE_STAT(interlock_same, - "Same lock hits in interlock"); -DIRCACHE_STAT(interlock_direct, - "Direct lock order hits in interlock"); -DIRCACHE_STAT(interlock_reverse, - "Reverse lock order hits in interlock"); -DIRCACHE_STAT(interlock_reverse_fast, - "Reverse lock order without sleeping hits in interlock"); - -static int -ptr_cmp(const void *a, const void *b) -{ - return (((uintptr_t)(*(void * const *)a)) - - ((uintptr_t)(*(void * const *)b))); -} - static void dircache_sysinit(void *arg __unused) { - int i; - - pool_size = 4; - dircache_zone = uma_zcreate("dircache", sizeof(struct dircache), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - pool = malloc(sizeof(void *) * pool_size, - M_DIRCACHE, M_WAITOK); - pool_mtxname = malloc(sizeof(void *) * pool_size, - M_DIRCACHE, M_WAITOK); - /* - * Keep struct dircache_pool size minimal. (and align at cache - * pipeline?) - * Use pool address for lock ordering. - */ - for (i = 0; i < pool_size; i++) { - pool_mtxname[i] = malloc(pool_mtxnamesz, - M_DIRCACHE, M_WAITOK | M_ZERO); - pool[i] = malloc(sizeof(struct dircache_pool), - M_DIRCACHE, M_WAITOK | M_ZERO); - } - qsort(pool, pool_size, sizeof(void *), ptr_cmp); - for (i = 0; i < pool_size; i++) { - pool[i]->dp_gen = pool_id++; - snprintf(pool_mtxname[i], pool_mtxnamesz, "dircache lock %d", i); - mtx_init(&pool[i]->dp_mtx, pool_mtxname[i], NULL, MTX_DEF); - } } SYSINIT(dircache, SI_SUB_VFS, SI_ORDER_SECOND, dircache_sysinit, NULL); static void dircache_sysuninit(void *arg __unused) { - int i; - - for (i = 0; i < pool_size; i++) { - mtx_destroy(&pool[i]->dp_mtx); - free(pool[i], M_DIRCACHE); - free(pool_mtxname[i], M_DIRCACHE); - } - free(pool, M_DIRCACHE); - free(pool_mtxname, M_DIRCACHE); - pool = NULL; uma_zdestroy(dircache_zone); } SYSUNINIT(dircache, SI_SUB_VFS, SI_ORDER_SECOND, dircache_sysuninit, NULL); -static void -pool_getstats(struct dircache_poolstat *ps) -{ - struct dircache_poolstat *stat; - int i, ind; - - for (i = 0; i < pool_size; i++) { - mtx_lock(&pool[i]->dp_mtx); - stat = &pool[i]->dp_stat; - for (ind = 0; ind < dps_max; ind++) - ps->dps_stats[ind] += stat->dps_stats[ind]; - mtx_unlock(&pool[i]->dp_mtx); - } -} - -static int -dps_sysctlhandler(SYSCTL_HANDLER_ARGS) -{ - struct dircache_poolstat st = {}; - u_long res; - int error; - - pool_getstats(&st); - res = st.dps_stats[arg2]; - error = SYSCTL_OUT(req, &res, sizeof(res)); - - return (error); -} - -static __inline void -dp_incstat(int ind, struct dircache_pool *dp, u_long val) -{ - dp->dp_stat.dps_stats[ind] += val; -} - static __inline int dc_cmpname(struct dircache *dc, char *name, size_t namelen) { @@ -232,65 +127,18 @@ return (r); } -RB_GENERATE_STATIC(dircache_tree, dircache, dc_listentry, dc_cmp); +RB_GENERATE_STATIC(dircache_tree, dircache, dc_tree, dc_cmp); #define DC_MTX(dc) (&(dc)->dc_pool->dp_mtx) -#define dc_lock(dc) mtx_lock(DC_MTX(dc)) +#define dc_lock(dc) mtx_lock(&(dc)->dc_mtx) -#define dc_trylock(dc) mtx_trylock(DC_MTX(dc)) +#define dc_trylock(dc) mtx_trylock(&(dc)->dc_mtx) -#define dc_unlock(dc) mtx_unlock(DC_MTX(dc)) +#define dc_unlock(dc) mtx_unlock(&(dc)->dc_mtx) -#define dc_assertlock(dc, w) mtx_assert(DC_MTX(dc), (w)) - -static void -dc_relock(struct dircache *from, struct dircache *to) -{ - dc_assertlock(from, MA_OWNED); - - if (from->dc_pool == to->dc_pool) - return; - - dc_assertlock(to, MA_NOTOWNED); - - dc_unlock(from); - dc_lock(to); -} - -static void -dc_interlock(struct dircache *from, struct dircache *to) -{ - dc_assertlock(from, MA_OWNED); - - if (from->dc_pool == to->dc_pool) { - dp_incstat(dps_interlock_same, to->dc_pool, 1); - return; - } - - dc_assertlock(to, MA_NOTOWNED); - if ((uintptr_t)from->dc_pool < (uintptr_t)to->dc_pool) { - dc_lock(to); - dc_unlock(from); - dp_incstat(dps_interlock_direct, to->dc_pool, 1); - return; - } +#define dc_assertlock(dc, w) mtx_assert(&(dc)->dc_mtx, (w)) - critical_enter(); - if (dc_trylock(to) != 0) { - dc_unlock(from); - critical_exit(); - dp_incstat(dps_interlock_reverse_fast, to->dc_pool, 1); - return; - } - critical_exit(); - - /* !!!! FIXME !!!! */ - dc_unlock(from); - dc_lock(to); - dp_incstat(dps_interlock_reverse, to->dc_pool, 1); -} - static __inline void dc_initname(struct dircache *dc, char *name, size_t namelen) { @@ -306,9 +154,9 @@ } static __inline int -dc_namebuffits(struct dircache *dc, size_t namelen) +dc_namebuffits(u_int dcnamelen, u_int nnamelen) { - return (dc_namebuflen(dc->dc_namelen) < namelen + 1); + return (dc_namebuflen(dcnamelen) < nnamelen + 1); } static __inline char * @@ -325,7 +173,8 @@ { MPASS(name != dc->dc_name); - if (dc->dc_name == NULL || dc_namebuffits(dc, namelen) == 0) { + if (dc->dc_name == NULL || + dc_namebuffits(dc->dc_namelen, namelen) == 0) { if (dc->dc_name != NULL) free(dc->dc_name, M_DIRCACHE); if (namebuf == NULL) @@ -342,39 +191,28 @@ static __inline void dc_updategen(struct dircache *dc) { - u_long *genp; + static u_long gen = 1; + dc_assertlock(dc, MA_OWNED); - - genp = &dc->dc_pool->dp_gen; - *genp += pool_size; - dc->dc_gen = *genp; + do { + dc->dc_gen = atomic_fetchadd_long(&gen, 1); + } while (__predict_false(dc->dc_gen == 0)); } static struct dircache * -dc_alloc(struct dircache *pdc, enum dircache_type type, - char *name, size_t namelen) +dc_alloc(enum dircache_type type, char *name, size_t namelen) { struct dircache *dc; - int poolind; dc = uma_zalloc(dircache_zone, M_WAITOK | M_ZERO); DCDEBUG("alloc: %p %s\n", dc, name); dc->dc_type = type; - dc->dc_flags = DC_CH_PARTIAL; - dc->dc_parent = pdc; refcount_init(&dc->dc_refcnt, 1); - cv_init(&dc->dc_condvar, "dircache cv"); + mtx_init(&dc->dc_mtx, "dircache mtx", NULL, MTX_DEF | MTX_DUPOK); - if (name != NULL && namelen != 0) { + if (name != NULL && namelen != 0) dc_setname(dc, name, namelen, NULL); - /* cheaper way to get pseudo-random value */ - poolind = dc->dc_namehash; - } else { - poolind = arc4random(); - } - poolind %= pool_size; - dc->dc_pool = pool[poolind]; return (dc); } @@ -386,7 +224,7 @@ MPASS(dc->dc_parent == NULL); DCDEBUG("free: %p %s\n", dc, dc->dc_name); - cv_destroy(&dc->dc_condvar); + mtx_destroy(&dc->dc_mtx); uma_zfree(dircache_zone, dc); } @@ -398,35 +236,28 @@ } static __inline int -dc_rele(struct dircache *dc) +dc_relel(struct dircache *dc) { - dc_assertlock(dc, MA_NOTOWNED); + dc_assertlock(dc, MA_OWNED); if (refcount_release(&dc->dc_refcnt) != 0) { + dc_unlock(dc); dc_free(dc); return (1); } return (0); } -static struct dircache * -dc_wait(struct dircache *dc) +static __inline int +dc_rele(struct dircache *dc) { - dc_assertlock(dc, MA_OWNED); + dc_assertlock(dc, MA_NOTOWNED); - if ((dc->dc_flags & DC_CH_UPDATING) == 0) - return (NULL); - - dc->dc_refcnt++; - cv_wait(&dc->dc_condvar, &dc->dc_pool->dp_mtx); - dc->dc_refcnt--; - if (dc->dc_refcnt == 0) { - dc_unlock(dc); + if (refcount_release(&dc->dc_refcnt) != 0) { dc_free(dc); - return (NULL); + return (1); } - - return (dc); + return (0); } static void @@ -449,7 +280,7 @@ } static void -dc_relevnode(struct dircache *dc) +dc_relevnode(struct dircache *dc, int flags) { MPASS(dc->dc_vnode != NULL); dc_assertlock(dc, MA_OWNED); @@ -458,12 +289,44 @@ VI_LOCK(dc->dc_vnode); TAILQ_REMOVE(&dc->dc_vnode->v_dircache, dc, dc_vnodelist); - VI_UNLOCK(dc->dc_vnode); + if ((flags & DC_OP_VLOCK) == 0) + VI_UNLOCK(dc->dc_vnode); dc->dc_vnode = NULL; dc_unlock(dc); dc_rele(dc); } +static int +dc_vinterlock(struct vnode *vp, struct dircache *dc) +{ + ASSERT_VI_LOCKED(vp, "dc_vinterlock"); + dc_assertlock(dc, MA_NOTOWNED); + + if (dc_trylock(dc)) { + MPASS(dc->dc_vnode == vp); + VI_UNLOCK(vp); + return (0); + } + + dc_ref(dc); + VI_UNLOCK(vp); + dc_lock(dc); + + if (dc->dc_vnode != vp) { + VI_LOCK(vp); + dc_unlock(dc); + return (1); + } + + if (dc_relel(dc) != 0) { + VI_LOCK(vp); + return (1); + } + + MPASS(dc->dc_vnode == vp); + return (0); +} + static struct dircache * dc_getentry(struct vnode *vp, struct componentname *cnp, struct vnode *dvp) { @@ -473,14 +336,15 @@ VI_LOCK(vp); dc = TAILQ_FIRST(&vp->v_dircache); if (dc == NULL) { - VI_UNLOCK(vp); if ((vp->v_vflag & VV_ROOT) != 0) { dc = vp->v_mount->mnt_dircache; + VI_UNLOCK(vp); DCDEBUG("getentry: root %p vp=%p\n", dc, vp); MPASS(dc != NULL); dc_lock(dc); dc_refvnode(dc, vp); } else { + VI_UNLOCK(vp); #if 0 DCDEBUG("getentry: not found vp=%p\n", vp); #else @@ -497,19 +361,19 @@ cnp->cn_nameptr[1] == '.')))); for(; dc != NULL; dc = TAILQ_NEXT(dc, dc_vnodelist)) { - VI_UNLOCK(vp); - dc_lock(dc); - if (dc->dc_vnode != vp) { - dc_unlock(dc); + if (dc_vinterlock(vp, dc) != 0) { DCDEBUG("getenrty: restart; multiple entries; vp=%p\n", vp); goto restart; } - /* FIXME: dc_parent locking */ + dc_lock(dc->dc_parent); if (dc_cmpname(dc, cnp->cn_nameptr, cnp->cn_namelen) == 0 && - dvp == dc->dc_parent->dc_vnode) + dvp == dc->dc_parent->dc_vnode) { + dc_unlock(dc->dc_parent); break; + } + dc_unlock(dc->dc_parent); dc_unlock(dc); VI_LOCK(vp); } @@ -522,115 +386,153 @@ #endif } } else { - VI_UNLOCK(vp); - dc_lock(dc); + if (dc_vinterlock(vp, dc) != 0) { + DCDEBUG("getenrty: restart; node removed; vp=%p\n", vp); + goto restart; + } } } dc_assertlock(dc, MA_OWNED); - if (dc->dc_vnode != vp) { - dc_unlock(dc); - DCDEBUG("getenrty: restart; vp=%p\n", vp); - goto restart; - } + MPASS(dc->dc_vnode == vp); return (dc); } static struct dircache * -dc_find(struct vnode *dvp, struct componentname *cnp, int flags) +dc_find(struct vnode *dvp, struct componentname *cnp) { struct dircache key; struct dircache *pdc, *dc; + int pdcref; pdc = dc_getentry(dvp, NULL, NULL); if (pdc == NULL) return (NULL); dc_assertlock(pdc, MA_OWNED); + pdcref = 0; dc_initname(&key, cnp->cn_nameptr, cnp->cn_namelen); + +restart: dc = RB_FIND(dircache_tree, &pdc->dc_children, &key); if (dc == NULL) { dc_unlock(pdc); - return (NULL); + goto out; } - if ((flags & DC_OP_NOWAIT) == 0) - dc_wait(pdc); - - dc_interlock(pdc, dc); + if (dc_trylock(dc) != 0) + dc_unlock(pdc); + else { + if (pdcref == 0) { + dc_ref(pdc); + pdcref++; + } + dc_ref(dc); + dc_unlock(pdc); + dc_lock(dc); + if (dc->dc_parent != pdc) { + dc_unlock(dc); + dc_rele(dc); + dc_lock(pdc); + goto restart; + } + if (dc_relel(dc) != 0) { + dc_lock(pdc); + goto restart; + } + } + dc_assertlock(pdc, MA_NOTOWNED); dc_assertlock(dc, MA_OWNED); MPASS(dc->dc_parent == pdc); +out: + if (pdcref != 0) + dc_rele(pdc); return (dc); } static struct dircache * -dc_update(struct dircache_cursor *curs, struct vnode *vp, - enum dircache_type type, char *name, size_t namelen, - ino_t inode, off_t offset, void *fspriv) +dc_insert(struct dircache *pdc, struct dircache *dc, struct vnode *vp, + ino_t inode) { - struct dircache *dc, *pdc, *col; + struct dircache *col; - pdc = curs->dcr_parent; - MPASS((pdc->dc_flags & DC_CH_UPDATING) != 0); + DCDEBUG("update: parent=%p name=%s\n", pdc, pdc->dc_name); - DCDEBUG("update: parent=%p name=%s\n", pdc, name); +restart: + dc_assertlock(dc, MA_OWNED); + dc_assertlock(pdc, MA_OWNED); - dc = dc_alloc(pdc, type, name, namelen); - - if (type == DT_WEAK) - curs->dcr_nflags |= DC_CH_HASWEAK; - dc->dc_fspriv = fspriv; col = RB_INSERT(dircache_tree, &pdc->dc_children, dc); if (col != NULL) { - if (type == col->dc_type) { + if (dc->dc_type == col->dc_type) { DCDEBUG("update: warn: same entry added: %s\n", dc->dc_name); - MPASS(col->dc_inode == inode && col->dc_offset == offset); - dc->dc_fspriv = NULL; - dc->dc_parent = NULL; + MPASS(col->dc_inode == inode); + dc_unlock(pdc); + dc_unlock(dc); dc_rele(dc); return (NULL); } else if (col->dc_type == DT_NEGATIVE) { DCDEBUG("update: replace negative entry: %p %s\n", dc, dc->dc_name); - dc_lock(col); - col->dc_type = type; - MPASS((col->dc_flags & DC_CH_COMPLETE) == 0); - col->dc_flags |= DC_CH_PARTIAL; + dc_unlock(dc); + if (dc_trylock(col) == 0) { + dc_unlock(pdc); + dc_lock(col); + if (col->dc_parent != pdc) { + dc_unlock(col); + dc_lock(dc); + dc_lock(pdc); + goto restart; + } + dc_lock(pdc); + } + col->dc_type = dc->dc_type; col->dc_inode = inode; - col->dc_offset = offset; - MPASS(col->dc_fspriv == NULL); - col->dc_fspriv = fspriv; - dc->dc_fspriv = NULL; - dc_unlock(col); - dc->dc_parent = NULL; + dc_unlock(pdc); dc_rele(dc); dc = col; } else panic("dircache: update: ivalid entry: %d %s\n", dc->dc_type, dc->dc_name); - } else + } else { + dc->dc_parent = pdc; dc_ref(pdc); - if (vp != NULL) { - dc_lock(dc); + dc_unlock(pdc); + } + if (vp != NULL) dc_refvnode(dc, vp); - dc_unlock(dc); + return (dc); +} + +static __inline void +dc_assertempty(struct dircache *dc) +{ + struct dircache *child; + + RB_FOREACH(child, dircache_tree, &dc->dc_children) { + MPASS(child->dc_type == DT_NEGATIVE); } - return (dc); } static void dc_removeentry(struct dircache *dc) { struct dircache *parent; + MPASS(dc->dc_parent != NULL); + dc_assertlock(dc, MA_OWNED); + dc_assertlock(dc->dc_parent, MA_OWNED); + dc_assertempty(dc); - dc->dc_fspriv = NULL; + parent = dc->dc_parent; + if (parent->dc_type != DT_NEGATIVE) + dc_updategen(parent); dc->dc_type = DT_INVAL; - parent = dc->dc_parent; dc->dc_parent = NULL; RB_REMOVE(dircache_tree, &parent->dc_children, dc); + dc_unlock(parent); if (dc->dc_vnode != NULL) - dc_relevnode(dc); + dc_relevnode(dc, 0); else dc_unlock(dc); dc_rele(parent); @@ -641,15 +543,14 @@ dc_marknegative(struct dircache *dc) { DCDEBUG("mark negative: %p %s; vp=%p\n", dc, dc->dc_name, dc->dc_vnode); + dc_lock(dc->dc_parent); + dc_assertempty(dc); + dc_updategen(dc->dc_parent); + dc->dc_type = DT_NEGATIVE; + dc_unlock(dc->dc_parent); dc->dc_inode = 0; - dc->dc_offset = 0; - dc->dc_fspriv = NULL; - dc->dc_type = DT_NEGATIVE; - dc->dc_flags &= ~DC_CH_COMPLETE; - dc->dc_flags |= DC_CH_PARTIAL; - dc_updategen(dc); if (dc->dc_vnode != NULL) - dc_relevnode(dc); + dc_relevnode(dc, 0); else dc_unlock(dc); dc_assertlock(dc, MA_NOTOWNED); @@ -661,7 +562,7 @@ struct dircache *dc; MPASS(mp->mnt_dircache == NULL); - dc = dc_alloc(NULL, DT_ROOT, NULL, 0); + dc = dc_alloc(DT_ROOT, NULL, 0); dc->dc_inode = inode; mp->mnt_dircache = dc; DCDEBUG("init: root=%p %d\n", dc, inode); @@ -679,119 +580,58 @@ void dircache_purge_negative(struct vnode *vp) { - struct dircache *dc, *ch, *tmp; + TAILQ_HEAD(, dircache) head = TAILQ_HEAD_INITIALIZER(head); + struct dircache *dc, *child, *tmp; + int r; restart: VI_LOCK(vp); - TAILQ_FOREACH(dc, &vp->v_dircache, dc_vnodelist) { - DCDEBUG("purge negative: %p %s; vp=%p\n", dc, dc->dc_name, vp); + dc = TAILQ_FIRST(&vp->v_dircache); + if (dc == NULL) { VI_UNLOCK(vp); - dc_lock(dc); - if (dc->dc_vnode != vp) { - dc_unlock(dc); + return; + } + if (vp->v_type == VDIR) { + MPASS(TAILQ_NEXT(dc, dc_vnodelist) == NULL); + if (dc_vinterlock(vp, dc) != 0) goto restart; - } - RB_FOREACH_SAFE(ch, dircache_tree, &dc->dc_children, tmp) { - if (ch->dc_type == DT_NEGATIVE) + dc_ref(dc); + RB_FOREACH_SAFE(child, dircache_tree, &dc->dc_children, tmp) { + if (child->dc_type == DT_NEGATIVE) { RB_REMOVE(dircache_tree, &dc->dc_children, - ch); + child); + if (dc_trylock(child) != 0) { + child->dc_parent = NULL; + dc_unlock(child); + dc_rele(child); + r = dc_relel(dc); + MPASS(r == 0); + } else + TAILQ_INSERT_HEAD(&head, child, + dc_tmplist); + } } - VI_LOCK(vp); dc_unlock(dc); + while(!TAILQ_EMPTY(&head)) { + child = TAILQ_FIRST(&head); + dc_lock(child); + MPASS(child->dc_parent == dc); + dc_lock(dc); + child->dc_parent = NULL; + dc_unlock(dc); + dc_rele(child); + dc_rele(dc); + } + dc_rele(dc); + } else { + /* Check invariants */ + TAILQ_FOREACH(dc, &vp->v_dircache, dc_vnodelist) { + MPASS(dc->dc_type != DT_NEGATIVE); + } + VI_UNLOCK(vp); } - VI_UNLOCK(vp); } -void -dircache_update(struct dircache_cursor *curs, enum dircache_type type, - char *name, size_t namelen, ino_t inode, off_t offset) -{ - dc_update(curs, NULL, type, name, namelen, inode, offset, NULL); -} - -int -dircache_beginupdate(struct dircache_cursor *curs, struct vnode *dvp, - struct componentname *cnp, int flags) -{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 22 09:40:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1C591065676; Tue, 22 Jun 2010 09:40:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77AEC1065674 for ; Tue, 22 Jun 2010 09:40:06 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 660398FC19 for ; Tue, 22 Jun 2010 09:40:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M9e6E5088138 for ; Tue, 22 Jun 2010 09:40:06 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5M9e6Xk088136 for perforce@freebsd.org; Tue, 22 Jun 2010 09:40:06 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 22 Jun 2010 09:40:06 GMT Message-Id: <201006220940.o5M9e6Xk088136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 09:40:07 -0000 http://p4web.freebsd.org/@@180100?ac=10 Change 180100 by lz@gnehzuil-freebsd on 2010/06/22 09:40:04 Add 'async' mode into ext2fs. * Add 'async' option in order to make ext2fs can be mounted in async mode. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#6 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#6 (text+ko) ==== @@ -95,9 +95,9 @@ static int compute_sb_data(struct vnode * devvp, struct ext2fs * es, struct m_ext2fs * fs); -static const char *ext2_opts[] = { "from", "export", "acls", "noexec", - "noatime", "union", "suiddir", "multilabel", "nosymfollow", - "noclusterr", "noclusterw", "force", NULL }; +static const char *ext2_opts[] = { "acls", "async", "export", "force", + "from", "multilabel", "noatime", "noclusterr", "noclusterw", + "noexec", "nosymfollow", "suiddir", "union", NULL }; /* * VFS Operations. From owner-p4-projects@FreeBSD.ORG Tue Jun 22 09:51:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4634F1065675; Tue, 22 Jun 2010 09:51:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AD271065672 for ; Tue, 22 Jun 2010 09:51:19 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED87C8FC0C for ; Tue, 22 Jun 2010 09:51:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M9pIxZ088959 for ; Tue, 22 Jun 2010 09:51:18 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5M9pIcC088957 for perforce@freebsd.org; Tue, 22 Jun 2010 09:51:18 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 22 Jun 2010 09:51:18 GMT Message-Id: <201006220951.o5M9pIcC088957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 09:51:19 -0000 http://p4web.freebsd.org/@@180101?ac=10 Change 180101 by lz@gnehzuil-freebsd on 2010/06/22 09:50:57 Add ext2_extents.h file and fix a typo. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extents.h#1 add .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#11 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#11 (text+ko) ==== @@ -75,4 +75,4 @@ int ext2_alloc_rsv(struct inode *, int32_t, int32_t, int, struct ucred *, int32_t *); -#endif /* !_FS_EXT2FS_EXT2_EXTERN_H_ */ +#endif /* !_FS_EXT2FS_EXT2_RSV_WIN_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Jun 22 09:57:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E24651065675; Tue, 22 Jun 2010 09:57:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6EC8106564A for ; Tue, 22 Jun 2010 09:57:25 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D0B98FC1A for ; Tue, 22 Jun 2010 09:57:25 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5M9vPOA089366 for ; Tue, 22 Jun 2010 09:57:25 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5M9vPTm089364 for perforce@freebsd.org; Tue, 22 Jun 2010 09:57:25 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 22 Jun 2010 09:57:25 GMT Message-Id: <201006220957.o5M9vPTm089364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 09:57:27 -0000 http://p4web.freebsd.org/@@180102?ac=10 Change 180102 by lz@gnehzuil-freebsd on 2010/06/22 09:57:23 Remove ext2_extents.h file because the repository is wrong. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extern.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 22 10:05:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD3861065674; Tue, 22 Jun 2010 10:05:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1B1E106566B for ; Tue, 22 Jun 2010 10:05:34 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 76DEE8FC1D for ; Tue, 22 Jun 2010 10:05:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MA5Yqg091006 for ; Tue, 22 Jun 2010 10:05:34 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5MA5YmM091004 for perforce@freebsd.org; Tue, 22 Jun 2010 10:05:34 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 22 Jun 2010 10:05:34 GMT Message-Id: <201006221005.o5MA5YmM091004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 10:05:35 -0000 http://p4web.freebsd.org/@@180103?ac=10 Change 180103 by lz@gnehzuil-freebsd on 2010/06/22 10:04:51 Add ext2_extents.h file. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_extents.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 22 11:33:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB14F1065675; Tue, 22 Jun 2010 11:33:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FCEC1065673 for ; Tue, 22 Jun 2010 11:33:10 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E7B08FC14 for ; Tue, 22 Jun 2010 11:33:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MBXA7N098413 for ; Tue, 22 Jun 2010 11:33:10 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5MBXAeb098411 for perforce@freebsd.org; Tue, 22 Jun 2010 11:33:10 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 22 Jun 2010 11:33:10 GMT Message-Id: <201006221133.o5MBXAeb098411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180105 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 11:33:11 -0000 http://p4web.freebsd.org/@@180105?ac=10 Change 180105 by lz@gnehzuil-freebsd on 2010/06/22 11:32:20 Add three data structures into ext2_extents.h. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_extents.h#2 edit Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_extents.h#2 (text+ko) ==== @@ -28,4 +28,37 @@ #ifndef _FS_EXT2FS_EXT2_EXTENTS_H_ #define _FS_EXT2FS_EXT2_EXTENTS_H_ +#define EXT4_EXT_MAGIC 0xf30a + +/* + * ext4 file system extent on disk + */ +struct ext4_extent { + u_int32_t e_blk; /* first logical block */ + u_int16_t e_len; /* number of blocks */ + u_int16_t e_start_hi; /* high 16 bits of physical block */ + u_int32_t e_start_lo; /* low 32 bits of physical block */ +}; + +/* + * extent index on disk + */ +struct ext4_extent_index { + u_int32_t ei_blk; /* indexes logical blocks */ + u_int32_t ei_leaf_lo; /* pointes to physical block of the next level */ + u_int16_t ei_leaf_hi; /* high 16 bits of physical block */ + u_int16_t ei_unused; +}; + +/* + * extent tree header + */ +struct ext4_extent_header { + u_int16_t eh_magic; /* magic number: 0xf30a */ + u_int16_t eh_ecount; /* number of valid entries */ + u_int16_t eh_max; /* capacity of store in entries */ + u_int16_t eh_depth; /* the depth of extent tree */ + u_int32_t eh_gen; /* generation of extent tree */ +}; + #endif /* !_FS_EXT2FS_EXT2_EXTENTS_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Jun 22 14:22:03 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C28261065679; Tue, 22 Jun 2010 14:22:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85C77106566B; Tue, 22 Jun 2010 14:22:03 +0000 (UTC) (envelope-from ivoras@gmail.com) Received: from mail-ww0-f54.google.com (mail-ww0-f54.google.com [74.125.82.54]) by mx1.freebsd.org (Postfix) with ESMTP id 85C3E8FC23; Tue, 22 Jun 2010 14:22:02 +0000 (UTC) Received: by wwe15 with SMTP id 15so1280087wwe.13 for ; Tue, 22 Jun 2010 07:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:sender:received :in-reply-to:references:from:date:x-google-sender-auth:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=8fYE9qBNPF5/FdkZzX2eqhagfQLXBEp7r2dsNzlDxvI=; b=BbgulzKdGMjojfl5hvDzNmqE5PG43I7zF/iGZG9zNBIF0zBINcVro02LzqP3i809G0 ek+yzDkfsBKZ3BFVcKejIFTNMuL3NQUfZ6Q/sYvFuY1Uv+ZAvO3Pz/3vzI9MeGX8Piz/ eW7x3CurMydTqWRtNXSvucqjmWldSdWebWzSo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :content-transfer-encoding; b=MuNxZ6afwWmpSxuz9U4KkiJwmrnB6qamrCy1NQfOX7tAAeU6yba59SkQh7HvfVGg1u bh0GNDL/9V+1xhNz1Z40YccxXac7psABv/L8PfziXYkui8nCsp84CDRAkFHtaBsF6OKC Gr1/4MY0gzReMS8Fpg3Lv7oA/Hu9XpW1fqPk4= Received: by 10.227.68.134 with SMTP id v6mr6143844wbi.110.1277216517585; Tue, 22 Jun 2010 07:21:57 -0700 (PDT) MIME-Version: 1.0 Sender: ivoras@gmail.com Received: by 10.216.89.197 with HTTP; Tue, 22 Jun 2010 07:21:36 -0700 (PDT) In-Reply-To: References: <201006210045.o5L0jgZ3009138@repoman.freebsd.org> From: Ivan Voras Date: Tue, 22 Jun 2010 16:21:36 +0200 X-Google-Sender-Auth: l6gTh23w354H5qSRpT_q5G846zI Message-ID: To: Garrett Cooper Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Andrew Pantyukhin , Perforce Change Reviews , Julien LAFFAYE Subject: Re: PERFORCE change 180026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 14:22:04 -0000 On 21 June 2010 03:25, Garrett Cooper wrote: > On Sun, Jun 20, 2010 at 6:15 PM, Ivan Voras wrote: >> On 21 June 2010 02:58, Julien LAFFAYE wrote: >>> Why don't you use read_plist(Package *pkg, int fd) from libpkg instead? >> >> Should I, in the light of >> YES_I_KNOW_THE_API_IS_RUBBISH_AND_IS_DOOMED_TO_CHANGE ? I thought the >> entire lib is to be rightfully scrapped and implemented as something >> decent. > > =C2=A0 =C2=A0Yes, it will be eventually, but there's no real harm in > implementing this bit with read_plist for the time being though. If > and when dforsyth's work gets straightened out, a lot of this crud > will get scrapped and/or properly rewritten. Just to confirm this: for example, if I need to get the MD5 hash of a file from this structure, is the accepted practice to scan through the entire list searching for the file node and then scan the rest of the list searching for the first comment node that begins with "MD5:"? From owner-p4-projects@FreeBSD.ORG Tue Jun 22 15:13:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B2A0106567D; Tue, 22 Jun 2010 15:13:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 081171065675 for ; Tue, 22 Jun 2010 15:13:11 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E95C08FC1A for ; Tue, 22 Jun 2010 15:13:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MFDA9K029511 for ; Tue, 22 Jun 2010 15:13:10 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5MFDAQW029509 for perforce@freebsd.org; Tue, 22 Jun 2010 15:13:10 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 22 Jun 2010 15:13:10 GMT Message-Id: <201006221513.o5MFDAQW029509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 15:13:11 -0000 http://p4web.freebsd.org/@@180107?ac=10 Change 180107 by pgj@csupor on 2010/06/22 15:12:28 s/u_int/uint/g, because the latter one is C99 Suggested by: trasz Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#69 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#67 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/net/route.c#9 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/net/route.h#5 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netatalk/ddp_var.h#3 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/icmp_var.h#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_mroute.h#7 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_var.h#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/pim_var.h#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_var.h#7 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/udp_var.h#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.h#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_var.h#5 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/pim6_var.h#3 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/raw_ip6.h#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.h#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/keysock.h#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/ipx_var.h#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx_var.h#5 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#69 (text+ko) ==== @@ -330,14 +330,14 @@ const char *netstat_st_get_extname(const struct socket_type *stp); const struct sockbuf_type *netstat_st_get_snd(const struct socket_type *stp); const struct sockbuf_type *netstat_st_get_rcv(const struct socket_type *stp); -u_int16_t netstat_st_get_qlen(const struct socket_type *stp); -u_int16_t netstat_st_get_incqlen(const struct socket_type *stp); -u_int16_t netstat_st_get_qlimit(const struct socket_type *stp); -u_int64_t netstat_st_get_pcb(const struct socket_type *stp); -u_int64_t netstat_st_get_vnode(const struct socket_type *stp); -u_int64_t netstat_st_get_conn(const struct socket_type *stp); -u_int64_t netstat_st_get_refs(const struct socket_type *stp); -u_int64_t netstat_st_get_reflink(const struct socket_type *stp); +uint16_t netstat_st_get_qlen(const struct socket_type *stp); +uint16_t netstat_st_get_incqlen(const struct socket_type *stp); +uint16_t netstat_st_get_qlimit(const struct socket_type *stp); +uint64_t netstat_st_get_pcb(const struct socket_type *stp); +uint64_t netstat_st_get_vnode(const struct socket_type *stp); +uint64_t netstat_st_get_conn(const struct socket_type *stp); +uint64_t netstat_st_get_refs(const struct socket_type *stp); +uint64_t netstat_st_get_reflink(const struct socket_type *stp); const char *netstat_st_get_tcpstate(const struct socket_type *stp); enum tcp_state netstat_st_get_tcps(const struct socket_type *stp); /* Socket addresses: */ @@ -349,16 +349,16 @@ const char *netstat_sat_get_numeric(const struct sockaddr_type *satp); int netstat_sat_get_address(const struct sockaddr_type *satp, char *addr, int addr_len); -u_int16_t netstat_sat_get_port(const struct sockaddr_type *satp); +uint16_t netstat_sat_get_port(const struct sockaddr_type *satp); const char *netstat_sat_get_portname(struct sockaddr_type *satp); /* Socket buffers: */ -u_int32_t netstat_sbt_get_cc(const struct sockbuf_type *sbtp); -u_int32_t netstat_sbt_get_hiwat(const struct sockbuf_type *sbtp); -u_int32_t netstat_sbt_get_lowat(const struct sockbuf_type *sbtp); -u_int32_t netstat_sbt_get_mbcnt(const struct sockbuf_type *sbtp); -u_int32_t netstat_sbt_get_mcnt(const struct sockbuf_type *sbtp); -u_int32_t netstat_sbt_get_ccnt(const struct sockbuf_type *sbtp); -u_int32_t netstat_sbt_get_mbmax(const struct sockbuf_type *sbtp); +uint32_t netstat_sbt_get_cc(const struct sockbuf_type *sbtp); +uint32_t netstat_sbt_get_hiwat(const struct sockbuf_type *sbtp); +uint32_t netstat_sbt_get_lowat(const struct sockbuf_type *sbtp); +uint32_t netstat_sbt_get_mbcnt(const struct sockbuf_type *sbtp); +uint32_t netstat_sbt_get_mcnt(const struct sockbuf_type *sbtp); +uint32_t netstat_sbt_get_ccnt(const struct sockbuf_type *sbtp); +uint32_t netstat_sbt_get_mbmax(const struct sockbuf_type *sbtp); /* "Memory buffers" */ struct mbuf_type *netstat_mbt_alloc(void); @@ -375,23 +375,23 @@ const struct buffer_type *netstat_mbt_get_jumbop(const struct mbuf_type *); const struct buffer_type *netstat_mbt_get_jumbo9(const struct mbuf_type *); const struct buffer_type *netstat_mbt_get_jumbo16(const struct mbuf_type *); -u_int64_t netstat_mbt_get_bytes_inuse(const struct mbuf_type *); -u_int64_t netstat_mbt_get_bytes_incache(const struct mbuf_type *); -u_int64_t netstat_mbt_get_bytes_total(const struct mbuf_type *); -u_int64_t netstat_mbt_get_drain(const struct mbuf_type *); -u_int64_t netstat_mbt_get_sf_bufs(const struct mbuf_type *); -u_int64_t netstat_mbt_get_sf_bufs_peak(const struct mbuf_type *); -u_int64_t netstat_mbt_get_sf_bufs_inuse(const struct mbuf_type *); -u_int64_t netstat_mbt_get_sf_iocnt(const struct mbuf_type *); -u_int64_t netstat_mbt_get_sf_allocfail(const struct mbuf_type *); -u_int64_t netstat_mbt_get_sf_allocwait(const struct mbuf_type *); +uint64_t netstat_mbt_get_bytes_inuse(const struct mbuf_type *); +uint64_t netstat_mbt_get_bytes_incache(const struct mbuf_type *); +uint64_t netstat_mbt_get_bytes_total(const struct mbuf_type *); +uint64_t netstat_mbt_get_drain(const struct mbuf_type *); +uint64_t netstat_mbt_get_sf_bufs(const struct mbuf_type *); +uint64_t netstat_mbt_get_sf_bufs_peak(const struct mbuf_type *); +uint64_t netstat_mbt_get_sf_bufs_inuse(const struct mbuf_type *); +uint64_t netstat_mbt_get_sf_iocnt(const struct mbuf_type *); +uint64_t netstat_mbt_get_sf_allocfail(const struct mbuf_type *); +uint64_t netstat_mbt_get_sf_allocwait(const struct mbuf_type *); -u_int64_t netstat_bt_get_count(const struct buffer_type *); -u_int64_t netstat_bt_get_bytes(const struct buffer_type *); -u_int64_t netstat_bt_get_free(const struct buffer_type *); -u_int64_t netstat_bt_get_failures(const struct buffer_type *); -u_int64_t netstat_bt_get_size(const struct buffer_type *); -u_int64_t netstat_bt_get_limit(const struct buffer_type *); +uint64_t netstat_bt_get_count(const struct buffer_type *); +uint64_t netstat_bt_get_bytes(const struct buffer_type *); +uint64_t netstat_bt_get_free(const struct buffer_type *); +uint64_t netstat_bt_get_failures(const struct buffer_type *); +uint64_t netstat_bt_get_size(const struct buffer_type *); +uint64_t netstat_bt_get_limit(const struct buffer_type *); /* Interfaces: */ struct interface_type_list *netstat_itl_alloc(void); @@ -412,10 +412,10 @@ int domain, struct interface_type_list *list, int flags); const char *netstat_it_get_name(const struct interface_type *); -u_int64_t netstat_it_get_mtu(const struct interface_type *); -int netstat_it_get_flags(const struct interface_type *); -u_int64_t netstat_it_get_collisions(const struct interface_type *); -u_int64_t netstat_it_get_drops(const struct interface_type *); +uint64_t netstat_it_get_mtu(const struct interface_type *); +int netstat_it_get_flags(const struct interface_type *); +uint64_t netstat_it_get_collisions(const struct interface_type *); +uint64_t netstat_it_get_drops(const struct interface_type *); const struct face_type *netstat_it_get_in(const struct interface_type *); const struct face_type *netstat_it_get_out(const struct interface_type *); @@ -427,22 +427,22 @@ const struct intfaddr_type * netstat_it_get_mcast_address(const struct interface_type *, int index); -u_int64_t netstat_ft_get_packets(const struct face_type *); -u_int64_t netstat_ft_get_bytes(const struct face_type *); -u_int64_t netstat_ft_get_mcasts(const struct face_type *); -u_int64_t netstat_ft_get_errors(const struct face_type *); -u_int64_t netstat_ft_get_drops(const struct face_type *); +uint64_t netstat_ft_get_packets(const struct face_type *); +uint64_t netstat_ft_get_bytes(const struct face_type *); +uint64_t netstat_ft_get_mcasts(const struct face_type *); +uint64_t netstat_ft_get_errors(const struct face_type *); +uint64_t netstat_ft_get_drops(const struct face_type *); /* Interface addresses: */ int netstat_iat_get_family(const struct intfaddr_type *); const char *netstat_iat_get_address(const struct intfaddr_type *, int numeric); const char *netstat_iat_get_network(const struct intfaddr_type *, int numeric); enum intfaddr_layer netstat_iat_get_layer(const struct intfaddr_type *); -u_int64_t netstat_iat_get_ipackets(const struct intfaddr_type *); -u_int64_t netstat_iat_get_ibytes(const struct intfaddr_type *); -u_int64_t netstat_iat_get_opackets(const struct intfaddr_type *); -u_int64_t netstat_iat_get_obytes(const struct intfaddr_type *); -u_int32_t netstat_iat_get_refcount(const struct intfaddr_type *); +uint64_t netstat_iat_get_ipackets(const struct intfaddr_type *); +uint64_t netstat_iat_get_ibytes(const struct intfaddr_type *); +uint64_t netstat_iat_get_opackets(const struct intfaddr_type *); +uint64_t netstat_iat_get_obytes(const struct intfaddr_type *); +uint32_t netstat_iat_get_refcount(const struct intfaddr_type *); /* BPF peers: */ struct bpf_type_list *netstat_bptl_alloc(void); @@ -460,20 +460,20 @@ int netstat_bpf(const struct session_type *, const char *name, struct bpf_type_list *list, int flags); -int netstat_bpt_get_flags(const struct bpf_type *); -enum bpf_dir netstat_bpt_get_direction(const struct bpf_type *); -u_int32_t netstat_bpt_get_pid(const struct bpf_type *); +int netstat_bpt_get_flags(const struct bpf_type *); +enum bpf_dir netstat_bpt_get_direction(const struct bpf_type *); +uint32_t netstat_bpt_get_pid(const struct bpf_type *); const char *netstat_bpt_get_ifname(const struct bpf_type *); -u_int64_t netstat_bpt_get_recv(const struct bpf_type *); -u_int64_t netstat_bpt_get_drop(const struct bpf_type *); -u_int64_t netstat_bpt_get_match(const struct bpf_type *); -u_int64_t netstat_bpt_get_slen(const struct bpf_type *); -u_int64_t netstat_bpt_get_hlen(const struct bpf_type *); +uint64_t netstat_bpt_get_recv(const struct bpf_type *); +uint64_t netstat_bpt_get_drop(const struct bpf_type *); +uint64_t netstat_bpt_get_match(const struct bpf_type *); +uint64_t netstat_bpt_get_slen(const struct bpf_type *); +uint64_t netstat_bpt_get_hlen(const struct bpf_type *); const char *netstat_bpt_get_pidname(const struct bpf_type *); /* Timestamp: */ -u_int32_t netstat_ts_get_sec(const struct timestamp_type *); -u_int32_t netstat_ts_get_usec(const struct timestamp_type *); +uint32_t netstat_ts_get_sec(const struct timestamp_type *); +uint32_t netstat_ts_get_usec(const struct timestamp_type *); /* Protocol-dependent statistics: */ struct stat_type *netstat_stat_alloc(void); @@ -486,185 +486,185 @@ const struct tcp_stat *netstat_get_tcpstats(const struct stat_type *); -u_int64_t netstat_tcps_get_connattempt(const struct tcp_stat *); -u_int64_t netstat_tcps_get_accepts(const struct tcp_stat *); -u_int64_t netstat_tcps_get_connects(const struct tcp_stat *); -u_int64_t netstat_tcps_get_drops(const struct tcp_stat *); -u_int64_t netstat_tcps_get_conndrops(const struct tcp_stat *); -u_int64_t netstat_tcps_get_minmssdrops(const struct tcp_stat *); -u_int64_t netstat_tcps_get_closed(const struct tcp_stat *); -u_int64_t netstat_tcps_get_segstimed(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rttupdated(const struct tcp_stat *); -u_int64_t netstat_tcps_get_delack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_timeoutdrop(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rexmttimeo(const struct tcp_stat *); -u_int64_t netstat_tcps_get_persisttimeo(const struct tcp_stat *); -u_int64_t netstat_tcps_get_keeptimeo(const struct tcp_stat *); -u_int64_t netstat_tcps_get_keepprobe(const struct tcp_stat *); -u_int64_t netstat_tcps_get_keepdrops(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndtotal(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndpack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndbyte(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndrexmitpack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndrexmitbyte(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndrexmitbad(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndacks(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndprobe(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndurg(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndwinup(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sndctrl(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvtotal(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvpack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvbyte(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvbadsum(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvbadoff(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvmemdrop(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvshort(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvduppack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvdupbyte(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvpartduppack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvpartdupbyte(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvoopack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvoobyte(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvpackafterwin(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvbyteafterwin(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvafterclose(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvwinprobe(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvdupack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvacktoomuch(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvackpack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvackbyte(const struct tcp_stat *); -u_int64_t netstat_tcps_get_rcvwinupd(const struct tcp_stat *); -u_int64_t netstat_tcps_get_pawsdrop(const struct tcp_stat *); -u_int64_t netstat_tcps_get_predack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_preddat(const struct tcp_stat *); -u_int64_t netstat_tcps_get_pcbcachemiss(const struct tcp_stat *); -u_int64_t netstat_tcps_get_cachedrtt(const struct tcp_stat *); -u_int64_t netstat_tcps_get_cachedrttvar(const struct tcp_stat *); -u_int64_t netstat_tcps_get_cachedssthresh(const struct tcp_stat *); -u_int64_t netstat_tcps_get_usedrtt(const struct tcp_stat *); -u_int64_t netstat_tcps_get_usedrttvar(const struct tcp_stat *); -u_int64_t netstat_tcps_get_usedssthresh(const struct tcp_stat *); -u_int64_t netstat_tcps_get_persistdrop(const struct tcp_stat *); -u_int64_t netstat_tcps_get_badsyn(const struct tcp_stat *); -u_int64_t netstat_tcps_get_mturesent(const struct tcp_stat *); -u_int64_t netstat_tcps_get_listendrop(const struct tcp_stat *); -u_int64_t netstat_tcps_get_badrst(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_added(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_retransmitted(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_dupsyn(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_dropped(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_completed(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_bucketoverflow(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_cacheoverflow(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_reset(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_stale(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_aborted(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_badack(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_unreach(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_zonefail(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_sendcookie(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sc_recvcookie(const struct tcp_stat *); -u_int64_t netstat_tcps_get_hc_added(const struct tcp_stat *); -u_int64_t netstat_tcps_get_hc_bucketoverflow(const struct tcp_stat *); -u_int64_t netstat_tcps_get_finwait2_drops(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sack_recovery_episode(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sack_rexmits(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sack_rexmit_bytes(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sack_rcv_blocks(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sack_send_blocks(const struct tcp_stat *); -u_int64_t netstat_tcps_get_sack_sboverflow(const struct tcp_stat *); -u_int64_t netstat_tcps_get_ecn_ce(const struct tcp_stat *); -u_int64_t netstat_tcps_get_ecn_ect0(const struct tcp_stat *); -u_int64_t netstat_tcps_get_ecn_ect1(const struct tcp_stat *); -u_int64_t netstat_tcps_get_ecn_shs(const struct tcp_stat *); -u_int64_t netstat_tcps_get_ecn_rcwnd(const struct tcp_stat *); +uint64_t netstat_tcps_get_connattempt(const struct tcp_stat *); +uint64_t netstat_tcps_get_accepts(const struct tcp_stat *); +uint64_t netstat_tcps_get_connects(const struct tcp_stat *); +uint64_t netstat_tcps_get_drops(const struct tcp_stat *); +uint64_t netstat_tcps_get_conndrops(const struct tcp_stat *); +uint64_t netstat_tcps_get_minmssdrops(const struct tcp_stat *); +uint64_t netstat_tcps_get_closed(const struct tcp_stat *); +uint64_t netstat_tcps_get_segstimed(const struct tcp_stat *); +uint64_t netstat_tcps_get_rttupdated(const struct tcp_stat *); +uint64_t netstat_tcps_get_delack(const struct tcp_stat *); +uint64_t netstat_tcps_get_timeoutdrop(const struct tcp_stat *); +uint64_t netstat_tcps_get_rexmttimeo(const struct tcp_stat *); +uint64_t netstat_tcps_get_persisttimeo(const struct tcp_stat *); +uint64_t netstat_tcps_get_keeptimeo(const struct tcp_stat *); +uint64_t netstat_tcps_get_keepprobe(const struct tcp_stat *); +uint64_t netstat_tcps_get_keepdrops(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndtotal(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndpack(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndbyte(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndrexmitpack(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndrexmitbyte(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndrexmitbad(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndacks(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndprobe(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndurg(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndwinup(const struct tcp_stat *); +uint64_t netstat_tcps_get_sndctrl(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvtotal(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvpack(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvbyte(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvbadsum(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvbadoff(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvmemdrop(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvshort(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvduppack(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvdupbyte(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvpartduppack(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvpartdupbyte(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvoopack(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvoobyte(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvpackafterwin(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvbyteafterwin(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvafterclose(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvwinprobe(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvdupack(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvacktoomuch(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvackpack(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvackbyte(const struct tcp_stat *); +uint64_t netstat_tcps_get_rcvwinupd(const struct tcp_stat *); +uint64_t netstat_tcps_get_pawsdrop(const struct tcp_stat *); +uint64_t netstat_tcps_get_predack(const struct tcp_stat *); +uint64_t netstat_tcps_get_preddat(const struct tcp_stat *); +uint64_t netstat_tcps_get_pcbcachemiss(const struct tcp_stat *); +uint64_t netstat_tcps_get_cachedrtt(const struct tcp_stat *); +uint64_t netstat_tcps_get_cachedrttvar(const struct tcp_stat *); +uint64_t netstat_tcps_get_cachedssthresh(const struct tcp_stat *); +uint64_t netstat_tcps_get_usedrtt(const struct tcp_stat *); +uint64_t netstat_tcps_get_usedrttvar(const struct tcp_stat *); +uint64_t netstat_tcps_get_usedssthresh(const struct tcp_stat *); +uint64_t netstat_tcps_get_persistdrop(const struct tcp_stat *); +uint64_t netstat_tcps_get_badsyn(const struct tcp_stat *); +uint64_t netstat_tcps_get_mturesent(const struct tcp_stat *); +uint64_t netstat_tcps_get_listendrop(const struct tcp_stat *); +uint64_t netstat_tcps_get_badrst(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_added(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_retransmitted(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_dupsyn(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_dropped(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_completed(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_bucketoverflow(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_cacheoverflow(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_reset(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_stale(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_aborted(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_badack(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_unreach(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_zonefail(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_sendcookie(const struct tcp_stat *); +uint64_t netstat_tcps_get_sc_recvcookie(const struct tcp_stat *); +uint64_t netstat_tcps_get_hc_added(const struct tcp_stat *); +uint64_t netstat_tcps_get_hc_bucketoverflow(const struct tcp_stat *); +uint64_t netstat_tcps_get_finwait2_drops(const struct tcp_stat *); +uint64_t netstat_tcps_get_sack_recovery_episode(const struct tcp_stat *); +uint64_t netstat_tcps_get_sack_rexmits(const struct tcp_stat *); +uint64_t netstat_tcps_get_sack_rexmit_bytes(const struct tcp_stat *); +uint64_t netstat_tcps_get_sack_rcv_blocks(const struct tcp_stat *); +uint64_t netstat_tcps_get_sack_send_blocks(const struct tcp_stat *); +uint64_t netstat_tcps_get_sack_sboverflow(const struct tcp_stat *); +uint64_t netstat_tcps_get_ecn_ce(const struct tcp_stat *); +uint64_t netstat_tcps_get_ecn_ect0(const struct tcp_stat *); +uint64_t netstat_tcps_get_ecn_ect1(const struct tcp_stat *); +uint64_t netstat_tcps_get_ecn_shs(const struct tcp_stat *); +uint64_t netstat_tcps_get_ecn_rcwnd(const struct tcp_stat *); const struct udp_stat *netstat_get_udpstats(const struct stat_type *); -u_int64_t netstat_udps_get_ipackets(const struct udp_stat *); -u_int64_t netstat_udps_get_hdrops(const struct udp_stat *); -u_int64_t netstat_udps_get_badsum(const struct udp_stat *); -u_int64_t netstat_udps_get_nosum(const struct udp_stat *); -u_int64_t netstat_udps_get_badlen(const struct udp_stat *); -u_int64_t netstat_udps_get_noport(const struct udp_stat *); -u_int64_t netstat_udps_get_noportbcast(const struct udp_stat *); -u_int64_t netstat_udps_get_fullsock(const struct udp_stat *); -u_int64_t netstat_udps_get_pcbcachemiss(const struct udp_stat *); -u_int64_t netstat_udps_get_pcbhashmiss(const struct udp_stat *); -u_int64_t netstat_udps_get_delivered(const struct udp_stat *); -u_int64_t netstat_udps_get_opackets(const struct udp_stat *); -u_int64_t netstat_udps_get_fastout(const struct udp_stat *); -u_int64_t netstat_udps_get_noportmcast(const struct udp_stat *); -u_int64_t netstat_udps_get_filtermcast(const struct udp_stat *); +uint64_t netstat_udps_get_ipackets(const struct udp_stat *); +uint64_t netstat_udps_get_hdrops(const struct udp_stat *); +uint64_t netstat_udps_get_badsum(const struct udp_stat *); +uint64_t netstat_udps_get_nosum(const struct udp_stat *); +uint64_t netstat_udps_get_badlen(const struct udp_stat *); +uint64_t netstat_udps_get_noport(const struct udp_stat *); +uint64_t netstat_udps_get_noportbcast(const struct udp_stat *); +uint64_t netstat_udps_get_fullsock(const struct udp_stat *); +uint64_t netstat_udps_get_pcbcachemiss(const struct udp_stat *); +uint64_t netstat_udps_get_pcbhashmiss(const struct udp_stat *); +uint64_t netstat_udps_get_delivered(const struct udp_stat *); +uint64_t netstat_udps_get_opackets(const struct udp_stat *); +uint64_t netstat_udps_get_fastout(const struct udp_stat *); +uint64_t netstat_udps_get_noportmcast(const struct udp_stat *); +uint64_t netstat_udps_get_filtermcast(const struct udp_stat *); const struct carp_stat *netstat_get_carpstats(const struct stat_type *); -u_int64_t netstat_carps_get_ipackets(const struct carp_stat *); -u_int64_t netstat_carps_get_ipackets6(const struct carp_stat *); -u_int64_t netstat_carps_get_badif(const struct carp_stat *); -u_int64_t netstat_carps_get_badttl(const struct carp_stat *); -u_int64_t netstat_carps_get_hdrops(const struct carp_stat *); -u_int64_t netstat_carps_get_badsum(const struct carp_stat *); -u_int64_t netstat_carps_get_badver(const struct carp_stat *); -u_int64_t netstat_carps_get_badlen(const struct carp_stat *); -u_int64_t netstat_carps_get_badauth(const struct carp_stat *); -u_int64_t netstat_carps_get_badvhid(const struct carp_stat *); -u_int64_t netstat_carps_get_badaddrs(const struct carp_stat *); -u_int64_t netstat_carps_get_opackets(const struct carp_stat *); -u_int64_t netstat_carps_get_opackets6(const struct carp_stat *); -u_int64_t netstat_carps_get_onomem(const struct carp_stat *); -u_int64_t netstat_carps_get_ostates(const struct carp_stat *); -u_int64_t netstat_carps_get_preempt(const struct carp_stat *); +uint64_t netstat_carps_get_ipackets(const struct carp_stat *); +uint64_t netstat_carps_get_ipackets6(const struct carp_stat *); +uint64_t netstat_carps_get_badif(const struct carp_stat *); +uint64_t netstat_carps_get_badttl(const struct carp_stat *); +uint64_t netstat_carps_get_hdrops(const struct carp_stat *); +uint64_t netstat_carps_get_badsum(const struct carp_stat *); +uint64_t netstat_carps_get_badver(const struct carp_stat *); +uint64_t netstat_carps_get_badlen(const struct carp_stat *); +uint64_t netstat_carps_get_badauth(const struct carp_stat *); +uint64_t netstat_carps_get_badvhid(const struct carp_stat *); +uint64_t netstat_carps_get_badaddrs(const struct carp_stat *); +uint64_t netstat_carps_get_opackets(const struct carp_stat *); +uint64_t netstat_carps_get_opackets6(const struct carp_stat *); +uint64_t netstat_carps_get_onomem(const struct carp_stat *); +uint64_t netstat_carps_get_ostates(const struct carp_stat *); +uint64_t netstat_carps_get_preempt(const struct carp_stat *); const struct ip_stat *netstat_get_ipstats(const struct stat_type *); -u_int64_t netstat_ips_get_total(const struct ip_stat *); -u_int64_t netstat_ips_get_badsum(const struct ip_stat *); -u_int64_t netstat_ips_get_tooshort(const struct ip_stat *); -u_int64_t netstat_ips_get_toosmall(const struct ip_stat *); -u_int64_t netstat_ips_get_badhlen(const struct ip_stat *); -u_int64_t netstat_ips_get_badlen(const struct ip_stat *); -u_int64_t netstat_ips_get_fragments(const struct ip_stat *); -u_int64_t netstat_ips_get_fragdropped(const struct ip_stat *); -u_int64_t netstat_ips_get_fragtimeout(const struct ip_stat *); -u_int64_t netstat_ips_get_forward(const struct ip_stat *); -u_int64_t netstat_ips_get_fastforward(const struct ip_stat *); -u_int64_t netstat_ips_get_cantforward(const struct ip_stat *); -u_int64_t netstat_ips_get_redirectsent(const struct ip_stat *); -u_int64_t netstat_ips_get_noproto(const struct ip_stat *); -u_int64_t netstat_ips_get_delivered(const struct ip_stat *); -u_int64_t netstat_ips_get_localout(const struct ip_stat *); -u_int64_t netstat_ips_get_odropped(const struct ip_stat *); -u_int64_t netstat_ips_get_reassembled(const struct ip_stat *); -u_int64_t netstat_ips_get_fragmented(const struct ip_stat *); -u_int64_t netstat_ips_get_ofragments(const struct ip_stat *); -u_int64_t netstat_ips_get_cantfrag(const struct ip_stat *); -u_int64_t netstat_ips_get_badoptions(const struct ip_stat *); -u_int64_t netstat_ips_get_noroute(const struct ip_stat *); -u_int64_t netstat_ips_get_badvers(const struct ip_stat *); -u_int64_t netstat_ips_get_rawout(const struct ip_stat *); -u_int64_t netstat_ips_get_toolong(const struct ip_stat *); -u_int64_t netstat_ips_get_notmember(const struct ip_stat *); -u_int64_t netstat_ips_get_nogif(const struct ip_stat *); -u_int64_t netstat_ips_get_badaddr(const struct ip_stat *); +uint64_t netstat_ips_get_total(const struct ip_stat *); +uint64_t netstat_ips_get_badsum(const struct ip_stat *); +uint64_t netstat_ips_get_tooshort(const struct ip_stat *); +uint64_t netstat_ips_get_toosmall(const struct ip_stat *); +uint64_t netstat_ips_get_badhlen(const struct ip_stat *); +uint64_t netstat_ips_get_badlen(const struct ip_stat *); +uint64_t netstat_ips_get_fragments(const struct ip_stat *); +uint64_t netstat_ips_get_fragdropped(const struct ip_stat *); +uint64_t netstat_ips_get_fragtimeout(const struct ip_stat *); +uint64_t netstat_ips_get_forward(const struct ip_stat *); +uint64_t netstat_ips_get_fastforward(const struct ip_stat *); +uint64_t netstat_ips_get_cantforward(const struct ip_stat *); +uint64_t netstat_ips_get_redirectsent(const struct ip_stat *); +uint64_t netstat_ips_get_noproto(const struct ip_stat *); +uint64_t netstat_ips_get_delivered(const struct ip_stat *); +uint64_t netstat_ips_get_localout(const struct ip_stat *); +uint64_t netstat_ips_get_odropped(const struct ip_stat *); +uint64_t netstat_ips_get_reassembled(const struct ip_stat *); +uint64_t netstat_ips_get_fragmented(const struct ip_stat *); +uint64_t netstat_ips_get_ofragments(const struct ip_stat *); +uint64_t netstat_ips_get_cantfrag(const struct ip_stat *); +uint64_t netstat_ips_get_badoptions(const struct ip_stat *); +uint64_t netstat_ips_get_noroute(const struct ip_stat *); +uint64_t netstat_ips_get_badvers(const struct ip_stat *); +uint64_t netstat_ips_get_rawout(const struct ip_stat *); +uint64_t netstat_ips_get_toolong(const struct ip_stat *); +uint64_t netstat_ips_get_notmember(const struct ip_stat *); +uint64_t netstat_ips_get_nogif(const struct ip_stat *); +uint64_t netstat_ips_get_badaddr(const struct ip_stat *); const struct icmp_stat *netstat_get_icmpstats(const struct stat_type *); -u_int64_t netstat_icmps_get_error(const struct icmp_stat *); -u_int64_t netstat_icmps_get_oldshort(const struct icmp_stat *); -u_int64_t netstat_icmps_get_oldicmp(const struct icmp_stat *); -u_int64_t netstat_icmps_get_outhist(const struct icmp_stat *, int); -u_int64_t netstat_icmps_get_badcode(const struct icmp_stat *); -u_int64_t netstat_icmps_get_tooshort(const struct icmp_stat *); -u_int64_t netstat_icmps_get_checksum(const struct icmp_stat *); -u_int64_t netstat_icmps_get_badlen(const struct icmp_stat *); -u_int64_t netstat_icmps_get_reflect(const struct icmp_stat *); -u_int64_t netstat_icmps_get_inhist(const struct icmp_stat *, int); -u_int64_t netstat_icmps_get_bmcastecho(const struct icmp_stat *); -u_int64_t netstat_icmps_get_bmcasttstamp(const struct icmp_stat *); -u_int64_t netstat_icmps_get_badaddr(const struct icmp_stat *); -u_int64_t netstat_icmps_get_noroute(const struct icmp_stat *); +uint64_t netstat_icmps_get_error(const struct icmp_stat *); +uint64_t netstat_icmps_get_oldshort(const struct icmp_stat *); +uint64_t netstat_icmps_get_oldicmp(const struct icmp_stat *); +uint64_t netstat_icmps_get_outhist(const struct icmp_stat *, int); +uint64_t netstat_icmps_get_badcode(const struct icmp_stat *); +uint64_t netstat_icmps_get_tooshort(const struct icmp_stat *); +uint64_t netstat_icmps_get_checksum(const struct icmp_stat *); +uint64_t netstat_icmps_get_badlen(const struct icmp_stat *); +uint64_t netstat_icmps_get_reflect(const struct icmp_stat *); +uint64_t netstat_icmps_get_inhist(const struct icmp_stat *, int); +uint64_t netstat_icmps_get_bmcastecho(const struct icmp_stat *); +uint64_t netstat_icmps_get_bmcasttstamp(const struct icmp_stat *); +uint64_t netstat_icmps_get_badaddr(const struct icmp_stat *); +uint64_t netstat_icmps_get_noroute(const struct icmp_stat *); const char *netstat_icmpname(int); #ifdef INET6 const char *netstat_icmp6name(int); @@ -673,186 +673,186 @@ const struct pim_stat *netstat_get_pimstats(const struct stat_type *); -u_int64_t netstat_pims_get_rcv_total_msgs(const struct pim_stat *); -u_int64_t netstat_pims_get_rcv_total_bytes(const struct pim_stat *); -u_int64_t netstat_pims_get_rcv_tooshort(const struct pim_stat *); -u_int64_t netstat_pims_get_rcv_badsum(const struct pim_stat *); -u_int64_t netstat_pims_get_rcv_badversion(const struct pim_stat *); -u_int64_t netstat_pims_get_rcv_registers_msgs(const struct pim_stat *); -u_int64_t netstat_pims_get_rcv_registers_bytes(const struct pim_stat *); -u_int64_t netstat_pims_get_rcv_registers_wrongiif(const struct pim_stat *); -u_int64_t netstat_pims_get_rcv_badregisters(const struct pim_stat *); -u_int64_t netstat_pims_get_snd_registers_msgs(const struct pim_stat *); -u_int64_t netstat_pims_get_snd_registers_bytes(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_total_msgs(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_total_bytes(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_tooshort(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_badsum(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_badversion(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_registers_msgs(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_registers_bytes(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_registers_wrongiif(const struct pim_stat *); +uint64_t netstat_pims_get_rcv_badregisters(const struct pim_stat *); +uint64_t netstat_pims_get_snd_registers_msgs(const struct pim_stat *); +uint64_t netstat_pims_get_snd_registers_bytes(const struct pim_stat *); const struct igmp_stat *netstat_get_igmpstats(const struct stat_type *); -u_int64_t netstat_igmps_get_rcv_total(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_tooshort(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_badttl(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_badsum(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_v1v2_queries(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_v3_queries(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_badqueries(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_gen_queries(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_group_queries(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_gsr_queries(const struct igmp_stat *); -u_int64_t netstat_igmps_get_drop_gsr_queries(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_reports(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_badreports(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_ourreports(const struct igmp_stat *); -u_int64_t netstat_igmps_get_rcv_nora(const struct igmp_stat *); -u_int64_t netstat_igmps_get_snd_reports(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_total(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_tooshort(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_badttl(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_badsum(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_v1v2_queries(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_v3_queries(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_badqueries(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_gen_queries(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_group_queries(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_gsr_queries(const struct igmp_stat *); +uint64_t netstat_igmps_get_drop_gsr_queries(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_reports(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_badreports(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_ourreports(const struct igmp_stat *); +uint64_t netstat_igmps_get_rcv_nora(const struct igmp_stat *); +uint64_t netstat_igmps_get_snd_reports(const struct igmp_stat *); const struct ddp_stat *netstat_get_ddpstats(const struct stat_type *); -u_int64_t netstat_ddps_get_short(const struct ddp_stat *); -u_int64_t netstat_ddps_get_long(const struct ddp_stat *); -u_int64_t netstat_ddps_get_nosum(const struct ddp_stat *); -u_int64_t netstat_ddps_get_badsum(const struct ddp_stat *); -u_int64_t netstat_ddps_get_tooshort(const struct ddp_stat *); -u_int64_t netstat_ddps_get_toosmall(const struct ddp_stat *); -u_int64_t netstat_ddps_get_forward(const struct ddp_stat *); -u_int64_t netstat_ddps_get_encap(const struct ddp_stat *); -u_int64_t netstat_ddps_get_cantforward(const struct ddp_stat *); -u_int64_t netstat_ddps_get_nosockspace(const struct ddp_stat *); +uint64_t netstat_ddps_get_short(const struct ddp_stat *); +uint64_t netstat_ddps_get_long(const struct ddp_stat *); +uint64_t netstat_ddps_get_nosum(const struct ddp_stat *); +uint64_t netstat_ddps_get_badsum(const struct ddp_stat *); +uint64_t netstat_ddps_get_tooshort(const struct ddp_stat *); +uint64_t netstat_ddps_get_toosmall(const struct ddp_stat *); +uint64_t netstat_ddps_get_forward(const struct ddp_stat *); +uint64_t netstat_ddps_get_encap(const struct ddp_stat *); +uint64_t netstat_ddps_get_cantforward(const struct ddp_stat *); +uint64_t netstat_ddps_get_nosockspace(const struct ddp_stat *); #ifdef SCTP const struct sctp_stat *netstat_get_sctpstats(const struct stat_type *); const struct timestamp_type *netstat_sctps_get_discontinuitytime(const struct sctp_stat *); -u_int32_t netstat_sctps_get_currestab(const struct sctp_stat *); -u_int32_t netstat_sctps_get_activeestab(const struct sctp_stat *); -u_int32_t netstat_sctps_get_restartestab(const struct sctp_stat *); -u_int32_t netstat_sctps_get_collisionestab(const struct sctp_stat *); -u_int32_t netstat_sctps_get_passiveestab(const struct sctp_stat *); -u_int32_t netstat_sctps_get_aborted(const struct sctp_stat *); -u_int32_t netstat_sctps_get_shutdown(const struct sctp_stat *); -u_int32_t netstat_sctps_get_outoftheblue(const struct sctp_stat *); -u_int32_t netstat_sctps_get_checksumerrors(const struct sctp_stat *); -u_int32_t netstat_sctps_get_outcontrolchunks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_outorderchunks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_outunorderchunks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_incontrolchunks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_inorderchunks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_inunorderchunks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_fragusrmsgs(const struct sctp_stat *); -u_int32_t netstat_sctps_get_reasmusrmsgs(const struct sctp_stat *); -u_int32_t netstat_sctps_get_outpackets(const struct sctp_stat *); -u_int32_t netstat_sctps_get_inpackets(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvpackets(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvdatagrams(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvpktwithdata(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvsacks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvdata(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvdupdata(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvheartbeat(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvheartbeatack(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvecne(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvauth(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvauthmissing(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvivalhmacid(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvivalkeyid(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvauthfailed(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvexpress(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvexpressm(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvnocrc(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvswcrc(const struct sctp_stat *); -u_int32_t netstat_sctps_get_recvhwcrc(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendpackets(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendsacks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_senddata(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendretransdata(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendfastretrans(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendmultfastretrans(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendheartbeat(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendecne(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendauth(const struct sctp_stat *); -u_int32_t netstat_sctps_get_senderrors(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendnocrc(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendswcrc(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sendhwcrc(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpfmbox(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpfehos(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpmbda(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpmbct(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpbwrpt(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpcrupt(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpnedat(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrppdbrk(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrptsnnf(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpdnfnd(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpdiwnp(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpdizrw(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpbadd(const struct sctp_stat *); -u_int32_t netstat_sctps_get_pdrpmark(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoiterator(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timodata(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timowindowprobe(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoinit(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timosack(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoshutdown(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoheartbeat(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timocookie(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timosecret(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timopathmtu(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoshutdownack(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoshutdownguard(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timostrmrst(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoearlyfr(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoasconf(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timodelprim(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoautoclose(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoassockill(const struct sctp_stat *); -u_int32_t netstat_sctps_get_timoinpkill(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstart(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstop(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrmrkretrans(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstpout(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstpidsck1(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstpidsck2(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstpidsck3(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstpidsck4(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstrid(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstrout(const struct sctp_stat *); -u_int32_t netstat_sctps_get_earlyfrstrtmr(const struct sctp_stat *); -u_int32_t netstat_sctps_get_hdrops(const struct sctp_stat *); -u_int32_t netstat_sctps_get_badsum(const struct sctp_stat *); -u_int32_t netstat_sctps_get_noport(const struct sctp_stat *); -u_int32_t netstat_sctps_get_badvtag(const struct sctp_stat *); -u_int32_t netstat_sctps_get_badsid(const struct sctp_stat *); -u_int32_t netstat_sctps_get_nomem(const struct sctp_stat *); -u_int32_t netstat_sctps_get_fastretransinrtt(const struct sctp_stat *); -u_int32_t netstat_sctps_get_markedretrans(const struct sctp_stat *); -u_int32_t netstat_sctps_get_naglesent(const struct sctp_stat *); -u_int32_t netstat_sctps_get_naglequeued(const struct sctp_stat *); -u_int32_t netstat_sctps_get_maxburstqueued(const struct sctp_stat *); -u_int32_t netstat_sctps_get_ifnomemqueued(const struct sctp_stat *); -u_int32_t netstat_sctps_get_windowprobed(const struct sctp_stat *); -u_int32_t netstat_sctps_get_lowlevelerr(const struct sctp_stat *); -u_int32_t netstat_sctps_get_lowlevelerrusr(const struct sctp_stat *); -u_int32_t netstat_sctps_get_datadropchklmt(const struct sctp_stat *); -u_int32_t netstat_sctps_get_datadroprwnd(const struct sctp_stat *); -u_int32_t netstat_sctps_get_ecnereducedcwnd(const struct sctp_stat *); -u_int32_t netstat_sctps_get_vtagexpress(const struct sctp_stat *); -u_int32_t netstat_sctps_get_vtagbogus(const struct sctp_stat *); -u_int32_t netstat_sctps_get_primary_randry(const struct sctp_stat *); -u_int32_t netstat_sctps_get_cmt_randry(const struct sctp_stat *); -u_int32_t netstat_sctps_get_slowpath_sack(const struct sctp_stat *); -u_int32_t netstat_sctps_get_wu_sacks_sent(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sends_with_flags(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sends_with_unord(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sends_with_eof(const struct sctp_stat *); -u_int32_t netstat_sctps_get_sends_with_abort(const struct sctp_stat *); -u_int32_t netstat_sctps_get_protocol_drain_calls(const struct sctp_stat *); -u_int32_t netstat_sctps_get_protocol_drains_done(const struct sctp_stat *); -u_int32_t netstat_sctps_get_read_peeks(const struct sctp_stat *); -u_int32_t netstat_sctps_get_cached_chk(const struct sctp_stat *); -u_int32_t netstat_sctps_get_cached_strmoq(const struct sctp_stat *); -u_int32_t netstat_sctps_get_left_abandon(const struct sctp_stat *); -u_int32_t netstat_sctps_get_send_burst_avoid(const struct sctp_stat *); -u_int32_t netstat_sctps_get_send_cwnd_avoid(const struct sctp_stat *); -u_int32_t netstat_sctps_get_fwdtsn_map_over(const struct sctp_stat *); +uint32_t netstat_sctps_get_currestab(const struct sctp_stat *); +uint32_t netstat_sctps_get_activeestab(const struct sctp_stat *); +uint32_t netstat_sctps_get_restartestab(const struct sctp_stat *); +uint32_t netstat_sctps_get_collisionestab(const struct sctp_stat *); +uint32_t netstat_sctps_get_passiveestab(const struct sctp_stat *); +uint32_t netstat_sctps_get_aborted(const struct sctp_stat *); +uint32_t netstat_sctps_get_shutdown(const struct sctp_stat *); +uint32_t netstat_sctps_get_outoftheblue(const struct sctp_stat *); +uint32_t netstat_sctps_get_checksumerrors(const struct sctp_stat *); +uint32_t netstat_sctps_get_outcontrolchunks(const struct sctp_stat *); +uint32_t netstat_sctps_get_outorderchunks(const struct sctp_stat *); +uint32_t netstat_sctps_get_outunorderchunks(const struct sctp_stat *); +uint32_t netstat_sctps_get_incontrolchunks(const struct sctp_stat *); +uint32_t netstat_sctps_get_inorderchunks(const struct sctp_stat *); +uint32_t netstat_sctps_get_inunorderchunks(const struct sctp_stat *); +uint32_t netstat_sctps_get_fragusrmsgs(const struct sctp_stat *); +uint32_t netstat_sctps_get_reasmusrmsgs(const struct sctp_stat *); +uint32_t netstat_sctps_get_outpackets(const struct sctp_stat *); +uint32_t netstat_sctps_get_inpackets(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvpackets(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvdatagrams(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvpktwithdata(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvsacks(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvdata(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvdupdata(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvheartbeat(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvheartbeatack(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvecne(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvauth(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvauthmissing(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvivalhmacid(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvivalkeyid(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvauthfailed(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvexpress(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvexpressm(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvnocrc(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvswcrc(const struct sctp_stat *); +uint32_t netstat_sctps_get_recvhwcrc(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendpackets(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendsacks(const struct sctp_stat *); +uint32_t netstat_sctps_get_senddata(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendretransdata(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendfastretrans(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendmultfastretrans(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendheartbeat(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendecne(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendauth(const struct sctp_stat *); +uint32_t netstat_sctps_get_senderrors(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendnocrc(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendswcrc(const struct sctp_stat *); +uint32_t netstat_sctps_get_sendhwcrc(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpfmbox(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpfehos(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpmbda(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpmbct(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpbwrpt(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpcrupt(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpnedat(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrppdbrk(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrptsnnf(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpdnfnd(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpdiwnp(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpdizrw(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpbadd(const struct sctp_stat *); +uint32_t netstat_sctps_get_pdrpmark(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoiterator(const struct sctp_stat *); +uint32_t netstat_sctps_get_timodata(const struct sctp_stat *); +uint32_t netstat_sctps_get_timowindowprobe(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoinit(const struct sctp_stat *); +uint32_t netstat_sctps_get_timosack(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoshutdown(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoheartbeat(const struct sctp_stat *); +uint32_t netstat_sctps_get_timocookie(const struct sctp_stat *); +uint32_t netstat_sctps_get_timosecret(const struct sctp_stat *); +uint32_t netstat_sctps_get_timopathmtu(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoshutdownack(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoshutdownguard(const struct sctp_stat *); +uint32_t netstat_sctps_get_timostrmrst(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoearlyfr(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoasconf(const struct sctp_stat *); +uint32_t netstat_sctps_get_timodelprim(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoautoclose(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoassockill(const struct sctp_stat *); +uint32_t netstat_sctps_get_timoinpkill(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstart(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstop(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrmrkretrans(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstpout(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstpidsck1(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstpidsck2(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstpidsck3(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstpidsck4(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstrid(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstrout(const struct sctp_stat *); +uint32_t netstat_sctps_get_earlyfrstrtmr(const struct sctp_stat *); +uint32_t netstat_sctps_get_hdrops(const struct sctp_stat *); +uint32_t netstat_sctps_get_badsum(const struct sctp_stat *); +uint32_t netstat_sctps_get_noport(const struct sctp_stat *); +uint32_t netstat_sctps_get_badvtag(const struct sctp_stat *); +uint32_t netstat_sctps_get_badsid(const struct sctp_stat *); +uint32_t netstat_sctps_get_nomem(const struct sctp_stat *); +uint32_t netstat_sctps_get_fastretransinrtt(const struct sctp_stat *); +uint32_t netstat_sctps_get_markedretrans(const struct sctp_stat *); +uint32_t netstat_sctps_get_naglesent(const struct sctp_stat *); +uint32_t netstat_sctps_get_naglequeued(const struct sctp_stat *); +uint32_t netstat_sctps_get_maxburstqueued(const struct sctp_stat *); +uint32_t netstat_sctps_get_ifnomemqueued(const struct sctp_stat *); +uint32_t netstat_sctps_get_windowprobed(const struct sctp_stat *); +uint32_t netstat_sctps_get_lowlevelerr(const struct sctp_stat *); +uint32_t netstat_sctps_get_lowlevelerrusr(const struct sctp_stat *); +uint32_t netstat_sctps_get_datadropchklmt(const struct sctp_stat *); +uint32_t netstat_sctps_get_datadroprwnd(const struct sctp_stat *); +uint32_t netstat_sctps_get_ecnereducedcwnd(const struct sctp_stat *); +uint32_t netstat_sctps_get_vtagexpress(const struct sctp_stat *); +uint32_t netstat_sctps_get_vtagbogus(const struct sctp_stat *); +uint32_t netstat_sctps_get_primary_randry(const struct sctp_stat *); +uint32_t netstat_sctps_get_cmt_randry(const struct sctp_stat *); +uint32_t netstat_sctps_get_slowpath_sack(const struct sctp_stat *); +uint32_t netstat_sctps_get_wu_sacks_sent(const struct sctp_stat *); +uint32_t netstat_sctps_get_sends_with_flags(const struct sctp_stat *); +uint32_t netstat_sctps_get_sends_with_unord(const struct sctp_stat *); +uint32_t netstat_sctps_get_sends_with_eof(const struct sctp_stat *); +uint32_t netstat_sctps_get_sends_with_abort(const struct sctp_stat *); +uint32_t netstat_sctps_get_protocol_drain_calls(const struct sctp_stat *); +uint32_t netstat_sctps_get_protocol_drains_done(const struct sctp_stat *); +uint32_t netstat_sctps_get_read_peeks(const struct sctp_stat *); +uint32_t netstat_sctps_get_cached_chk(const struct sctp_stat *); +uint32_t netstat_sctps_get_cached_strmoq(const struct sctp_stat *); +uint32_t netstat_sctps_get_left_abandon(const struct sctp_stat *); +uint32_t netstat_sctps_get_send_burst_avoid(const struct sctp_stat *); +uint32_t netstat_sctps_get_send_cwnd_avoid(const struct sctp_stat *); +uint32_t netstat_sctps_get_fwdtsn_map_over(const struct sctp_stat *); #endif /* !SCTP */ #ifdef INET6 @@ -860,380 +860,380 @@ const char *netstat_ip6_nhist_name(int); const char *netstat_ip6_srcrule_name(int); -u_int64_t netstat_ip6s_get_total(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_tooshort(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_toosmall(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_fragments(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_fragdropped(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_fragtimeout(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_fragoverflow(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_forward(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_cantforward(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_redirectsent(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_delivered(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_localout(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_odropped(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_reassembled(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_fragmented(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_ofragments(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_cantfrag(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_badoptions(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_noroute(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_badvers(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_rawout(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_badscope(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_notmember(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_nxthist(const struct ip6_stat *, int); -u_int64_t netstat_ip6s_get_m1(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_m2m(const struct ip6_stat *, int); -u_int64_t netstat_ip6s_get_mext1(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_mext2m(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_exthdrtoolong(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_nogif(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_toomanyhdr(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_sources_none(const struct ip6_stat *); -u_int64_t netstat_ip6s_get_sources_sameif(const struct ip6_stat *, int); -u_int64_t netstat_ip6s_get_sources_otherif(const struct ip6_stat *, int); -u_int64_t netstat_ip6s_get_sources_samescope(const struct ip6_stat *, int); -u_int64_t netstat_ip6s_get_sources_otherscope(const struct ip6_stat *, int); -u_int64_t netstat_ip6s_get_sources_deprecated(const struct ip6_stat *, int); -u_int64_t netstat_ip6s_get_sources_rule(const struct ip6_stat *, int); +uint64_t netstat_ip6s_get_total(const struct ip6_stat *); +uint64_t netstat_ip6s_get_tooshort(const struct ip6_stat *); +uint64_t netstat_ip6s_get_toosmall(const struct ip6_stat *); +uint64_t netstat_ip6s_get_fragments(const struct ip6_stat *); +uint64_t netstat_ip6s_get_fragdropped(const struct ip6_stat *); +uint64_t netstat_ip6s_get_fragtimeout(const struct ip6_stat *); +uint64_t netstat_ip6s_get_fragoverflow(const struct ip6_stat *); +uint64_t netstat_ip6s_get_forward(const struct ip6_stat *); +uint64_t netstat_ip6s_get_cantforward(const struct ip6_stat *); +uint64_t netstat_ip6s_get_redirectsent(const struct ip6_stat *); +uint64_t netstat_ip6s_get_delivered(const struct ip6_stat *); +uint64_t netstat_ip6s_get_localout(const struct ip6_stat *); +uint64_t netstat_ip6s_get_odropped(const struct ip6_stat *); +uint64_t netstat_ip6s_get_reassembled(const struct ip6_stat *); +uint64_t netstat_ip6s_get_fragmented(const struct ip6_stat *); +uint64_t netstat_ip6s_get_ofragments(const struct ip6_stat *); +uint64_t netstat_ip6s_get_cantfrag(const struct ip6_stat *); +uint64_t netstat_ip6s_get_badoptions(const struct ip6_stat *); +uint64_t netstat_ip6s_get_noroute(const struct ip6_stat *); +uint64_t netstat_ip6s_get_badvers(const struct ip6_stat *); +uint64_t netstat_ip6s_get_rawout(const struct ip6_stat *); +uint64_t netstat_ip6s_get_badscope(const struct ip6_stat *); +uint64_t netstat_ip6s_get_notmember(const struct ip6_stat *); +uint64_t netstat_ip6s_get_nxthist(const struct ip6_stat *, int); +uint64_t netstat_ip6s_get_m1(const struct ip6_stat *); +uint64_t netstat_ip6s_get_m2m(const struct ip6_stat *, int); +uint64_t netstat_ip6s_get_mext1(const struct ip6_stat *); +uint64_t netstat_ip6s_get_mext2m(const struct ip6_stat *); +uint64_t netstat_ip6s_get_exthdrtoolong(const struct ip6_stat *); +uint64_t netstat_ip6s_get_nogif(const struct ip6_stat *); +uint64_t netstat_ip6s_get_toomanyhdr(const struct ip6_stat *); +uint64_t netstat_ip6s_get_sources_none(const struct ip6_stat *); +uint64_t netstat_ip6s_get_sources_sameif(const struct ip6_stat *, int); +uint64_t netstat_ip6s_get_sources_otherif(const struct ip6_stat *, int); +uint64_t netstat_ip6s_get_sources_samescope(const struct ip6_stat *, int); +uint64_t netstat_ip6s_get_sources_otherscope(const struct ip6_stat *, int); +uint64_t netstat_ip6s_get_sources_deprecated(const struct ip6_stat *, int); +uint64_t netstat_ip6s_get_sources_rule(const struct ip6_stat *, int); const struct icmp6_stat *netstat_get_icmp6stats(const struct stat_type *); -u_int64_t netstat_icmp6s_get_error(const struct icmp6_stat *); -u_int64_t netstat_icmp6s_get_canterror(const struct icmp6_stat *); -u_int64_t netstat_icmp6s_get_toofreq(const struct icmp6_stat *); -u_int64_t netstat_icmp6s_get_outhist(const struct icmp6_stat *, int); -u_int64_t netstat_icmp6s_get_badcode(const struct icmp6_stat *); -u_int64_t netstat_icmp6s_get_tooshort(const struct icmp6_stat *); -u_int64_t netstat_icmp6s_get_checksum(const struct icmp6_stat *); -u_int64_t netstat_icmp6s_get_badlen(const struct icmp6_stat *); -u_int64_t netstat_icmp6s_get_reflect(const struct icmp6_stat *); -u_int64_t netstat_icmp6s_get_inhist(const struct icmp6_stat *, int); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 22 16:12:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 165291065675; Tue, 22 Jun 2010 16:12:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE1F91065673 for ; Tue, 22 Jun 2010 16:12:15 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA3BF8FC1A for ; Tue, 22 Jun 2010 16:12:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MGCF1t034867 for ; Tue, 22 Jun 2010 16:12:15 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5MGCFxW034865 for perforce@freebsd.org; Tue, 22 Jun 2010 16:12:15 GMT (envelope-from ivoras@FreeBSD.org) Date: Tue, 22 Jun 2010 16:12:15 GMT Message-Id: <201006221612.o5MGCFxW034865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 16:12:16 -0000 http://p4web.freebsd.org/@@180110?ac=10 Change 180110 by ivoras@betelgeuse on 2010/06/22 16:12:02 Remove custom parsing of +CONTENTS, start working on applying the patch Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#16 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#6 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#6 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#15 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#15 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#16 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#14 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#14 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#14 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#13 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#16 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#6 (text+ko) ==== @@ -36,128 +36,67 @@ #include "hashjob.h" -enum PPMETHOD { PPMETHOD_UNKNOWN, PPMETHOD_CP, PPMETHOD_BSDIFF }; +/* + * Create a backup package (pkg_create -b) for the given package (identified + * by its full name, e.g. "apache-2.2.13"). + */ +static int +pkg_backup(char *name) +{ + char pkg_file[PATH_MAX]; + + if (!isinstalledpkg(name)) { + warnx("Package not installed: %s", name); + return (-1); + } + if (access(PKGPATCH_BACKUP_DIR, F_OK) != 0) { + if (mkdir(PKGPATCH_BACKUP_DIR, 0644) != 0) { + warnx("Cannot mkdir: %s", PKGPATCH_BACKUP_DIR); + return (-1); + } + } + snprintf(pkg_file, PATH_MAX, "%s/%s.%s", PKGPATCH_BACKUP_DIR, name, + PKG_FORMAT_EXT); + if (vsystem("%s -b %s %s", _PATH_PKG_CREATE, name, pkg_file) != 0) { + warnx("pkg_create -b %s %s failed", name, pkg_file); + return (-1); + } + if (Verbose) + printf("Created backup package: %s\n", pkg_file); + return (0); +} -STAILQ_HEAD(pplist_head, pplist); -struct pplist { - char filename[PATH_MAX]; - enum PPMETHOD method; - STAILQ_ENTRY(pplist) linkage; -}; +/* + * Read the given +CONTENTS file. + */ +static int +read_package_contents_file(char *pfilename, Package *pkg) +{ + FILE *fp; + + fp = fopen(pfilename, "r"); + if (fp == NULL) { + warnx("Cannot open file: %s", pfilename); + return (-1); + } + read_plist(pkg, fp); + return (0); +} -struct pkg_patch { - short int version_major; - short int version_minor; - char source[PATH_MAX]; - char target[PATH_MAX]; - struct pplist_head pp_add; - struct pplist_head pp_remove; - struct pplist_head pp_rmdir; - struct pplist_head pp_patch; -}; - - -static void -read_pkgpatch_file(char *filename, struct pkg_patch *pp) +/* + * Read live/installed package metadata. The package is identified by its full + * name (e.g. "apache-2.2.13"). + */ +static int +read_package_by_name(char *name, Package *pkg) { - FILE *fp; - char line[PATH_MAX], *p, *p2, *p3, *cmd; - int llen; - struct pplist *pl; + char pfilename[PATH_MAX]; - fp = fopen(filename, "r"); - if (fp == NULL) - err(1, "Cannot open file: %s", filename); - memset(pp, 0, sizeof(*pp)); - STAILQ_INIT(&pp->pp_add); - STAILQ_INIT(&pp->pp_remove); - STAILQ_INIT(&pp->pp_rmdir); - STAILQ_INIT(&pp->pp_patch); - - while (fgets(line, PATH_MAX, fp) != NULL) { - llen = strlen(line); - if (line[llen-1] == '\n') { - line[llen-1] = '\0'; /* strip newline */ - llen--; - } - p = strchr(line, '#'); /* skip comments */ - if (p != NULL) - *p = '\0'; - if (line[0] == '\0') /* skip empty lines */ - continue; - cmd = line; - p = strchr(line, ' '); - if (p == NULL) - errx(1, "Invalid command format in %s", PKGPATCH_FNAME); - *p++ = '\0'; - if (strcmp(cmd, "@version") == 0) { - p2 = strchr(p, '.'); - if (p2 == NULL) - errx(1, "Invalid version format in %s", - PKGPATCH_FNAME); - *p2++ = '\0'; - pp->version_major = atoi(p); - pp->version_minor = atoi(p2); - } else if (strcmp(cmd, "@source") == 0) { - strlcpy(pp->source, p, PATH_MAX); - } else if (strcmp(cmd, "@target") == 0) { - strlcpy(pp->target, p, PATH_MAX); - } else if (strcmp(cmd, "@add") == 0) { - pl = calloc(1, sizeof(*pl)); - strlcpy(pl->filename, p, PATH_MAX); - STAILQ_INSERT_TAIL(&pp->pp_add, pl, linkage); - } else if (strcmp(cmd, "@remove") == 0) { - pl = calloc(1, sizeof(*pl)); - strlcpy(pl->filename, p, PATH_MAX); - STAILQ_INSERT_TAIL(&pp->pp_remove, pl, linkage); - } else if (strcmp(cmd, "@rmdir") == 0) { - pl = calloc(1, sizeof(*pl)); - strlcpy(pl->filename, p, PATH_MAX); - STAILQ_INSERT_TAIL(&pp->pp_rmdir, pl, linkage); - } else if (strcmp(cmd, "@patch") == 0) { - pl = calloc(1, sizeof(*pl)); - p2 = strchr(p, '['); - if (p2 != NULL) { - /* - * Parse options block of the form - * \[name=value[,name=value...]\] - */ - char m[100], *pm, *p4, *p5; - - pm = m; - p3 = strchr(p2, ']'); - assert(p3-p2 < (int)sizeof(m)); - strlcpy(m, p2 + 1, p3 - p2); - p3++; - while (*p3 == ' ') - p3++; - strlcpy(pl->filename, p3, PATH_MAX); - while ((p4 = strsep(&pm, ",")) != NULL) { - p5 = strchr(p4, '='); - if (p5 != NULL) - *p5++ = '\0'; - if (strcmp(p4, "method") == 0) { - if (p5 == NULL) - errx(1, "patch option " - "error"); - if (strcmp(p5, "bsdiff") == 0) - pl->method = - PPMETHOD_BSDIFF; - } - } - } else { - /* Default options */ - strlcpy(pl->filename, p, PATH_MAX); - pl->method = PPMETHOD_CP; - } - STAILQ_INSERT_TAIL(&pp->pp_patch, pl, linkage); - } else - errx(1, "Unknown command: %s", cmd); - - } - fclose(fp); + snprintf(pfilename, PATH_MAX, "%s/%s/%s", LOG_DIR, name, + CONTENTS_FNAME); + return (read_package_contents_file(pfilename, pkg)); } @@ -167,7 +106,9 @@ char fpatch[PATH_MAX], dpatch[PATH_MAX], tmp[PATH_MAX]; struct pkgxjob xpatch; struct pkg_patch pp; - struct pkg_metadata pkg_live; + Package pkg_live, pkg_new; + struct pplist *pl; + unsigned int err_count = 0; if (argc < 1) errx(1, "Expecting argument: patch filename"); @@ -198,13 +139,43 @@ errx(1, "Invalid patch data format minor version number: %d\n", pp.version_minor); if (Verbose) - printf("Read patch data, version %d.%d for '%s' to '%s'\n", + printf("Parsed patch version %d.%d for '%s' to '%s'\n", pp.version_major, pp.version_minor, pp.source, pp.target); - /* Step 2 - read the existing (live system) package data */ + if (Verbose > 1) + printf("New files: %u, removed: %u, changed: %u, rmdirs: %u\n", + pplist_count(&pp.pp_add), pplist_count(&pp.pp_remove), + pplist_count(&pp.pp_patch), pplist_count(&pp.pp_rmdir)); + + if (!isinstalledpkg(pp.source)) + errx(1, "The patch file applies to package '%s' which doesn't " + "appear to be installed.", pp.source); + + /* + * Step 2 - read the existing (live system) package data and the new + * package data. + */ if (read_package_by_name(pp.source, &pkg_live) != 0) err(1, "Cannot read package information for %s", pp.source); + snprintf(tmp, PATH_MAX, "%s/%s", dpatch, CONTENTS_FNAME); + if (read_package_contents_file(tmp, &pkg_new) != 0) + err(1, "Cannot read package information from %s", tmp); - dump_package_info(&pkg_live); + /* Step 3 - verify that the live system and the patch file agree */ + if (Verbose > 1) + printf("Verifying live system and patch data consistency...\n"); + /* Check that files to be added don't exist already. */ + STAILQ_FOREACH(pl, &pp.pp_add, linkage) { + snprintf(tmp, PATH_MAX, "%s/%s", PREFIX, pl->filename); + if (access(tmp, F_OK) == 0) { + warnx("File exists but shouldn't: %s", tmp); + err_count++; + } + } + if (err_count != 0) + errx(1, "Found %u errors. Cannot continue.", err_count); + /* Step 4 - backup the existing package */ + if (pkg_backup(pp.source) != 0) + err(1, "Cannot backup package: %s", pp.source); } ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#6 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#15 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#15 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#16 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#14 (text+ko) ==== @@ -178,7 +178,8 @@ time(&tm); fprintf(fp, "# FreeBSD package patch archive created on %s\n", ctime(&tm)); - fprintf(fp, "@version %s\n", PKGPATCH_VERSION); + fprintf(fp, "@version %d.%d\n", PKGPATCH_VERSION_MAJOR, + PKGPATCH_VERSION_MINOR); parse_package_name(fold, tmp, tmp2, NULL); fprintf(fp, "@source %s-%s\n", tmp, tmp2); parse_package_name(fnew, tmp, tmp2, NULL); ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#14 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#14 (text+ko) ==== @@ -26,12 +26,26 @@ #ifndef _PATH_BSDIFF #define _PATH_BSDIFF "/usr/bin/bsdiff" #endif +#ifndef _PATH_PKG_CREATE +#define _PATH_PKG_CREATE "/usr/sbin/pkg_create" +#endif + +#ifndef PKG_FORMAT_EXT +#define PKG_FORMAT_EXT "tbz" +#endif #define PKGPATCH_FNAME "+PKGPATCH" #define PKGPATCH_VERSION_MAJOR 1 #define PKGPATCH_VERSION_MINOR 0 -#define PKGPATCH_VERSION "1.0" + +#define PKGPATCH_BACKUP_DIR_ENV "PKG_BACKUPDIR" +#define PKGPATCH_BACKUP_DIR_DEFAULT "/var/backups/pkg" +#define PKGPATCH_BACKUP_DIR (getenv(PKGPATCH_BACKUP_DIR_ENV) ? \ + getenv(PKGPATCH_BACKUP_DIR_ENV) : PKGPATCH_BACKUP_DIR_DEFAULT) +#define PREFIX_ENV "PREFIX" +#define PREFIX_DEFAULT "/usr/local" +#define PREFIX (getenv(PREFIX_ENV) ? getenv(PREFIX_ENV) : PREFIX_DEFAULT) enum PP_OP { PP_NONE, PP_MKPATCH, PP_APPLY }; @@ -47,37 +61,30 @@ SLIST_ENTRY(filelist) linkage; }; - SLIST_HEAD(pathlist_head, pathlist); struct pathlist { char path[PATH_MAX]; SLIST_ENTRY(pathlist) linkage; }; +enum PPMETHOD { PPMETHOD_UNKNOWN, PPMETHOD_CP, PPMETHOD_BSDIFF }; -STAILQ_HEAD(pkg_plist_head, pkg_plist); -struct pkg_plist { - char name[PATH_MAX]; - union { - char md5[33]; - char deporigin[PATH_MAX]; - } param; - plist_t type; - unsigned flags; - STAILQ_ENTRY(pkg_plist) linkage; +STAILQ_HEAD(pplist_head, pplist); +struct pplist { + char filename[PATH_MAX]; + enum PPMETHOD method; + STAILQ_ENTRY(pplist) linkage; }; -#define PLIST_FLAG_IGNORE 1 -struct pkg_metadata { - char name[PATH_MAX]; - char origin[PATH_MAX]; - char pkg_format_revision[16]; - char prefix[PATH_MAX]; - char display[PATH_MAX]; - char mtree[PATH_MAX]; - struct pkg_plist_head plist; - struct pathlist_head conflicts; - struct pathlist_head unknown_comments; +struct pkg_patch { + short int version_major; + short int version_minor; + char source[PATH_MAX]; + char target[PATH_MAX]; + struct pplist_head pp_add; + struct pplist_head pp_remove; + struct pplist_head pp_rmdir; + struct pplist_head pp_patch; }; @@ -91,6 +98,7 @@ #endif + int rm_rf(char *dir); int pkgxjob_start(struct pkgxjob *job, char *dir, char *filename); int pkgxjob_finish(struct pkgxjob *job); @@ -105,8 +113,7 @@ int copy_file_absolute(char *from, char *to); int copy_file_attrs(char *from, struct stat *st_from, char *to); int replicate_dirtree(char *from, char *to); -int read_package(FILE *fp, struct pkg_metadata *pkg); -int read_package_by_name(char *name, struct pkg_metadata *pkg); -void dump_package_info(struct pkg_metadata *pkg); +void read_pkgpatch_file(char *filename, struct pkg_patch *pp); +unsigned int pplist_count(struct pplist_head *ppl); #endif ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#13 (text+ko) ==== @@ -340,221 +340,122 @@ /* - * Parse the comment as if it were stand-alone, adding to package metadata. - * Destructive on cmt. + * Counts the elements in the given pplist. */ -static void -parse_pkg_comment(struct pkg_metadata *pkg, char *cmt) +unsigned int +pplist_count(struct pplist_head *ppl) { - char *v; - struct pathlist *plcmt; + unsigned int count = 0; + struct pplist *pl; - if ((v = strchr(cmt, ':')) == NULL) - goto unknown_comment; - *v++ = '\0'; - if (strcmp(cmt, "PKG_FORMAT_REVISION") == 0) - strncpy(pkg->pkg_format_revision, v, - sizeof(pkg->pkg_format_revision)); - else if (strcmp(cmt, "ORIGIN") == 0) - strncpy(pkg->origin, v, sizeof(pkg->origin)); - else { - *(--v) = ':'; - goto unknown_comment; - } - return; -unknown_comment: - plcmt = calloc(1, sizeof(*plcmt)); - strncpy(plcmt->path, cmt, sizeof(plcmt->path)); - SLIST_INSERT_HEAD(&pkg->unknown_comments, plcmt, linkage); + STAILQ_FOREACH(pl, ppl, linkage) + count++; + return (count); } /* - * Parse the comment and assign it to plist (if possible). Destructive on cmt. + * Reads the given file into struct pkg_patch. */ -static void -parse_plist_comment(struct pkg_metadata *pkg, struct pkg_plist *pl, char *cmt) -{ - char *v; - struct pathlist *plcmt; - - if ((v = strchr(cmt, ':')) == NULL) - goto unknown_comment; - *v++ = '\0'; - if (strcmp(cmt, "MD5") == 0) - strncpy(pl->param.md5, v, sizeof(pl->param.md5)); - else if (strcmp(cmt, "DEPORIGIN") == 0) { - if (pl->type != PLIST_PKGDEP) { - warnx("DEPORIGIN not set on @pkgdep? (%s:%s)", cmt, v); - return; - } - strncpy(pl->param.deporigin, v, sizeof(pl->param.deporigin)); - } else { - *(--v) = ':'; - goto unknown_comment; - } - return; -unknown_comment: - plcmt = calloc(1, sizeof(*plcmt)); - strncpy(plcmt->path, cmt, sizeof(plcmt->path)); - SLIST_INSERT_HEAD(&pkg->unknown_comments, plcmt, linkage); -} - - -/* Parse @conflicts */ -static void -parse_pkg_conflicts(struct pkg_metadata *pkg, char *cfl) -{ - struct pathlist *pcfl; - - pcfl = calloc(1, sizeof(*pcfl)); - strncpy(pcfl->path, cfl, sizeof(pcfl->path)); - SLIST_INSERT_HEAD(&pkg->conflicts, pcfl, linkage); -} - - -/* - * Reads the package +CONTENTS file into the struct pkg_metadata. - */ -int -read_package_by_name(char *name, struct pkg_metadata *pkg) +void +read_pkgpatch_file(char *filename, struct pkg_patch *pp) { - char pfilename[PATH_MAX]; FILE *fp; - int rval; + char line[PATH_MAX], *p, *p2, *p3, *cmd; + int llen; + struct pplist *pl; - snprintf(pfilename, PATH_MAX, "%s/%s/%s", LOG_DIR, name, - CONTENTS_FNAME); - if (access(pfilename, R_OK) != 0) { - warn("Cannot access %s for reading", pfilename); - return (-errno); - } - fp = fopen(pfilename, "r"); - if (fp == NULL) { - warn("Cannot open filename: %s", pfilename); - return (-errno); - } - rval = read_package(fp, pkg); - fclose(fp); - return (rval); -} - - -/* - * Reads the package metadata for the given package name in the package database - * structure. The name is a full package name, e.g. "sqlite3-3.6.19". - * Hopefully, one day, someone will make a canonical way to do this instead - * of reinwenting the wheel. The actual format of +CONTENTS is very lame. - */ -int -read_package(FILE *fp, struct pkg_metadata *pkg) -{ - char line[PATH_MAX]; - struct pkg_plist *pl = NULL; - int llen, rval; - - STAILQ_INIT(&pkg->plist); - SLIST_INIT(&pkg->conflicts); - SLIST_INIT(&pkg->unknown_comments); + fp = fopen(filename, "r"); + if (fp == NULL) + err(1, "Cannot open file: %s", filename); + memset(pp, 0, sizeof(*pp)); + STAILQ_INIT(&pp->pp_add); + STAILQ_INIT(&pp->pp_remove); + STAILQ_INIT(&pp->pp_rmdir); + STAILQ_INIT(&pp->pp_patch); - rval = 0; while (fgets(line, PATH_MAX, fp) != NULL) { - char *p, *cmd; - llen = strlen(line); if (line[llen-1] == '\n') { line[llen-1] = '\0'; /* strip newline */ llen--; } - if (line[0] == '\0') + p = strchr(line, '#'); /* skip comments */ + if (p != NULL) + *p = '\0'; + if (line[0] == '\0') /* skip empty lines */ continue; - /*printf("%s\n", line);*/ - if (line[0] == CMD_CHAR) { - cmd = line + 1; - p = strchr(line, ' '); - if (p == NULL) - p = line + llen; - *p++ = '\0'; - if (strcmp(cmd, "comment") == 0) { - if (pl != NULL) - /* Comment on a plist entry? */ - parse_plist_comment(pkg, pl, p); - else - /* Comment on the package? */ - parse_pkg_comment(pkg, p); - } else if (strcmp(cmd, "name") == 0) { - strncpy(pkg->name, p, sizeof(pkg->name)); - pl = NULL; - } else if (strcmp(cmd, "cwd") == 0) { - if (strcmp(p, ".") != 0) { - strncpy(pkg->prefix, p, sizeof(pkg->prefix)); - pl = NULL; - } - } else if (strcmp(cmd, "display") == 0) { - strncpy(pkg->display, p, sizeof(pkg->display)); - /*pl = NULL;*/ - } else if (strcmp(cmd, "mtree") == 0) { - strncpy(pkg->mtree, p, sizeof(pkg->mtree)); - /*pl = NULL;*/ - } else if (strcmp(cmd, "pkgdep") == 0) { - pl = calloc(1, sizeof(*pl)); - pl->type = PLIST_PKGDEP; - strncpy(pl->name, p, sizeof(pl->name)); - STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); - } else if (strcmp(cmd, "conflicts") == 0) { - parse_pkg_conflicts(pkg, p); - pl = NULL; - } else if (strcmp(cmd, "exec") == 0) { - pl = calloc(1, sizeof(*pl)); - pl->type = PLIST_CMD; - strncpy(pl->name, p, sizeof(pl->name)); - STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); - } else if (strcmp(cmd, "unexec") == 0) { - pl = calloc(1, sizeof(*pl)); - pl->type = PLIST_UNEXEC; - strncpy(pl->name, p, sizeof(pl->name)); - STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); - } else if (strcmp(cmd, "dirrm") == 0) { - pl = calloc(1, sizeof(*pl)); - pl->type = PLIST_DIR_RM; - strncpy(pl->name, p, sizeof(pl->name)); - STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); - } else if (strcmp(cmd, "ignore") == 0) { + cmd = line; + p = strchr(line, ' '); + if (p == NULL) + errx(1, "Invalid command format in %s", PKGPATCH_FNAME); + *p++ = '\0'; + if (strcmp(cmd, "@version") == 0) { + p2 = strchr(p, '.'); + if (p2 == NULL) + errx(1, "Invalid version format in %s", + PKGPATCH_FNAME); + *p2++ = '\0'; + pp->version_major = atoi(p); + pp->version_minor = atoi(p2); + } else if (strcmp(cmd, "@source") == 0) { + strlcpy(pp->source, p, PATH_MAX); + } else if (strcmp(cmd, "@target") == 0) { + strlcpy(pp->target, p, PATH_MAX); + } else if (strcmp(cmd, "@add") == 0) { + pl = calloc(1, sizeof(*pl)); + strlcpy(pl->filename, p, PATH_MAX); + STAILQ_INSERT_TAIL(&pp->pp_add, pl, linkage); + } else if (strcmp(cmd, "@remove") == 0) { + pl = calloc(1, sizeof(*pl)); + strlcpy(pl->filename, p, PATH_MAX); + STAILQ_INSERT_TAIL(&pp->pp_remove, pl, linkage); + } else if (strcmp(cmd, "@rmdir") == 0) { + pl = calloc(1, sizeof(*pl)); + strlcpy(pl->filename, p, PATH_MAX); + STAILQ_INSERT_TAIL(&pp->pp_rmdir, pl, linkage); + } else if (strcmp(cmd, "@patch") == 0) { + pl = calloc(1, sizeof(*pl)); + p2 = strchr(p, '['); + if (p2 != NULL) { /* - * Apparently, "ignore" is similar to - * "comment" in that it can apply to - * the preceeding item. + * Parse options block of the form + * \[name=value[,name=value...]\] */ - if (pl == NULL) - errx(1, "@ignore on non-plist"); - pl->flags |= PLIST_FLAG_IGNORE; - } else - warnx("Unknown command: '%s'", cmd); - } else { - pl = calloc(1, sizeof(*pl)); - pl->type = PLIST_FILE; - strncpy(pl->name, line, sizeof(pl->name)); - STAILQ_INSERT_TAIL(&pkg->plist, pl, linkage); - } + char m[100], *pm, *p4, *p5; + + pm = m; + p3 = strchr(p2, ']'); + assert(p3-p2 < (int)sizeof(m)); + strlcpy(m, p2 + 1, p3 - p2); + p3++; + while (*p3 == ' ') + p3++; + strlcpy(pl->filename, p3, PATH_MAX); + while ((p4 = strsep(&pm, ",")) != NULL) { + p5 = strchr(p4, '='); + if (p5 != NULL) + *p5++ = '\0'; + if (strcmp(p4, "method") == 0) { + if (p5 == NULL) + errx(1, "patch option " + "error"); + if (strcmp(p5, "bsdiff") == 0) + pl->method = + PPMETHOD_BSDIFF; + } + } + } else { + /* Default options */ + strlcpy(pl->filename, p, PATH_MAX); + pl->method = PPMETHOD_CP; + } + STAILQ_INSERT_TAIL(&pp->pp_patch, pl, linkage); + } else + errx(1, "Unknown command: %s", cmd); + } - return (0); + fclose(fp); } -/* - * Debugging function - dump human-readable info on the given - * package. - */ -void -dump_package_info(struct pkg_metadata *pkg) -{ - struct pkg_plist *pl; - - printf("name:\t%s\n", pkg->name); - printf("origin:\t%s\n", pkg->origin); - printf("format:\t%s\n", pkg->pkg_format_revision); - printf("prefix:\t%s\n", pkg->prefix); - STAILQ_FOREACH(pl, &pkg->plist, linkage) { - printf("plist:\t%s\n", pl->name); - } -} From owner-p4-projects@FreeBSD.ORG Tue Jun 22 20:10:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77D071065670; Tue, 22 Jun 2010 20:10:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CB11106564A for ; Tue, 22 Jun 2010 20:10:38 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 116B28FC08 for ; Tue, 22 Jun 2010 20:10:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MKAbju067194 for ; Tue, 22 Jun 2010 20:10:37 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5MKAbsH067192 for perforce@freebsd.org; Tue, 22 Jun 2010 20:10:37 GMT (envelope-from peter@wemm.org) Date: Tue, 22 Jun 2010 20:10:37 GMT Message-Id: <201006222010.o5MKAbsH067192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 20:10:38 -0000 http://p4web.freebsd.org/@@180118?ac=10 Change 180118 by peter@peter_daintree on 2010/06/22 20:10:13 Update to new world order. Affected files ... .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#98 edit .. //depot/projects/hammer/sys/sys/stat.h#18 edit Differences ... ==== //depot/projects/hammer/sys/kern/vfs_syscalls.c#98 (text+ko) ==== @@ -2289,15 +2289,15 @@ nst->st_uid = st->st_uid; nst->st_gid = st->st_gid; nst->st_rdev = st->st_rdev; - nst->st_atimespec = st->st_atimespec; - nst->st_mtimespec = st->st_mtimespec; - nst->st_ctimespec = st->st_ctimespec; + nst->st_atim = st->st_atim; + nst->st_mtim = st->st_mtim; + nst->st_ctim = st->st_ctim; nst->st_size = st->st_size; nst->st_blocks = st->st_blocks; nst->st_blksize = st->st_blksize; nst->st_flags = st->st_flags; nst->st_gen = st->st_gen; - nst->st_birthtimespec = st->st_birthtimespec; + nst->st_birthtim = st->st_birthtim; } /* ==== //depot/projects/hammer/sys/sys/stat.h#18 (text+ko) ==== @@ -158,21 +158,10 @@ uid_t st_uid; /* user ID of the file's owner */ gid_t st_gid; /* group ID of the file's group */ __new_ino_t st_ino; /* inode's number */ -#if __BSD_VISIBLE - struct timespec st_atimespec; /* time of last access */ - struct timespec st_mtimespec; /* time of last data modification */ - struct timespec st_ctimespec; /* time of last file status change */ - struct timespec st_birthtimespec; /* time of file creation */ -#else - time_t st_atime; /* time of last access */ - long st_atimensec; /* nsec of last access */ - time_t st_mtime; /* time of last data modification */ - long st_mtimensec; /* nsec of last data modification */ - time_t st_ctime; /* time of last file status change */ - long st_ctimensec; /* nsec of last file status change */ - time_t st_birthtime; /* time of file creation */ - long st_birthtimensec; /* nsec of file creation */ -#endif + struct timespec st_atim; /* time of last access */ + struct timespec st_mtim; /* time of last data modification */ + struct timespec st_ctim; /* time of last file status change */ + struct timespec st_birthtim; /* time of file creation */ off_t st_size; /* file size, in bytes */ __int64_t st_blocks; /* blocks allocated for file */ __uint32_t st_blksize; /* optimal blocksize for I/O */ From owner-p4-projects@FreeBSD.ORG Tue Jun 22 20:44:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 115A41065673; Tue, 22 Jun 2010 20:44:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF657106564A for ; Tue, 22 Jun 2010 20:44:15 +0000 (UTC) (envelope-from gibbs@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98B988FC0C for ; Tue, 22 Jun 2010 20:44:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MKiFBv069674 for ; Tue, 22 Jun 2010 20:44:15 GMT (envelope-from gibbs@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5MKiEJ2069672 for perforce@freebsd.org; Tue, 22 Jun 2010 20:44:14 GMT (envelope-from gibbs@freebsd.org) Date: Tue, 22 Jun 2010 20:44:14 GMT Message-Id: <201006222044.o5MKiEJ2069672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gibbs@freebsd.org using -f From: "Justin T. Gibbs" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 20:44:16 -0000 http://p4web.freebsd.org/@@180121?ac=10 Change 180121 by gibbs@gibbs-zfs on 2010/06/22 20:43:29 Integrate from //depot/vendor/freebsd_8/... Affected files ... .. //depot/projects/zfs/stable/8/COPYRIGHT#1 branch .. //depot/projects/zfs/stable/8/LOCKS#1 branch .. //depot/projects/zfs/stable/8/MAINTAINERS#1 branch .. //depot/projects/zfs/stable/8/Makefile#1 branch .. //depot/projects/zfs/stable/8/Makefile.inc1#1 branch .. //depot/projects/zfs/stable/8/ObsoleteFiles.inc#1 branch .. //depot/projects/zfs/stable/8/README#1 branch .. //depot/projects/zfs/stable/8/UPDATING#1 branch .. //depot/projects/zfs/stable/8/bin/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/Makefile.inc#1 branch .. //depot/projects/zfs/stable/8/bin/cat/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/cat/cat.1#1 branch .. //depot/projects/zfs/stable/8/bin/cat/cat.c#1 branch .. //depot/projects/zfs/stable/8/bin/chflags/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/chflags/chflags.1#1 branch .. //depot/projects/zfs/stable/8/bin/chflags/chflags.c#1 branch .. //depot/projects/zfs/stable/8/bin/chio/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/chio/chio.1#1 branch .. //depot/projects/zfs/stable/8/bin/chio/chio.c#1 branch .. //depot/projects/zfs/stable/8/bin/chio/defs.h#1 branch .. //depot/projects/zfs/stable/8/bin/chio/pathnames.h#1 branch .. //depot/projects/zfs/stable/8/bin/chmod/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/chmod/chmod.1#1 branch .. //depot/projects/zfs/stable/8/bin/chmod/chmod.c#1 branch .. //depot/projects/zfs/stable/8/bin/cp/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/cp/cp.1#1 branch .. //depot/projects/zfs/stable/8/bin/cp/cp.c#1 branch .. //depot/projects/zfs/stable/8/bin/cp/extern.h#1 branch .. //depot/projects/zfs/stable/8/bin/cp/utils.c#1 branch .. //depot/projects/zfs/stable/8/bin/csh/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/zfs/stable/8/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/zfs/stable/8/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/zfs/stable/8/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/zfs/stable/8/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/zfs/stable/8/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/zfs/stable/8/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/zfs/stable/8/bin/csh/config.h#1 branch .. //depot/projects/zfs/stable/8/bin/csh/config_p.h#1 branch .. //depot/projects/zfs/stable/8/bin/csh/host.defs#1 branch .. //depot/projects/zfs/stable/8/bin/csh/iconv.h#1 branch .. //depot/projects/zfs/stable/8/bin/csh/iconv_stub.c#1 branch .. //depot/projects/zfs/stable/8/bin/date/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/date/date.1#1 branch .. //depot/projects/zfs/stable/8/bin/date/date.c#1 branch .. //depot/projects/zfs/stable/8/bin/date/extern.h#1 branch .. //depot/projects/zfs/stable/8/bin/date/netdate.c#1 branch .. //depot/projects/zfs/stable/8/bin/date/vary.c#1 branch .. //depot/projects/zfs/stable/8/bin/date/vary.h#1 branch .. //depot/projects/zfs/stable/8/bin/dd/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/dd/args.c#1 branch .. //depot/projects/zfs/stable/8/bin/dd/conv.c#1 branch .. //depot/projects/zfs/stable/8/bin/dd/conv_tab.c#1 branch .. //depot/projects/zfs/stable/8/bin/dd/dd.1#1 branch .. //depot/projects/zfs/stable/8/bin/dd/dd.c#1 branch .. //depot/projects/zfs/stable/8/bin/dd/dd.h#1 branch .. //depot/projects/zfs/stable/8/bin/dd/extern.h#1 branch .. //depot/projects/zfs/stable/8/bin/dd/gen.c#1 branch .. //depot/projects/zfs/stable/8/bin/dd/misc.c#1 branch .. //depot/projects/zfs/stable/8/bin/dd/position.c#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.ascii#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.ebcdic#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.ibm#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.lcase#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.oldascii#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.oldibm#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.pareven#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.parnone#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.parodd#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.parset#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.swab#1 branch .. //depot/projects/zfs/stable/8/bin/dd/ref.ucase#1 branch .. //depot/projects/zfs/stable/8/bin/df/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/df/df.1#1 branch .. //depot/projects/zfs/stable/8/bin/df/df.c#1 branch .. //depot/projects/zfs/stable/8/bin/domainname/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/domainname/domainname.1#1 branch .. //depot/projects/zfs/stable/8/bin/domainname/domainname.c#1 branch .. //depot/projects/zfs/stable/8/bin/echo/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/echo/echo.1#1 branch .. //depot/projects/zfs/stable/8/bin/echo/echo.c#1 branch .. //depot/projects/zfs/stable/8/bin/ed/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/ed/POSIX#1 branch .. //depot/projects/zfs/stable/8/bin/ed/README#1 branch .. //depot/projects/zfs/stable/8/bin/ed/buf.c#1 branch .. //depot/projects/zfs/stable/8/bin/ed/cbc.c#1 branch .. //depot/projects/zfs/stable/8/bin/ed/ed.1#1 branch .. //depot/projects/zfs/stable/8/bin/ed/ed.h#1 branch .. //depot/projects/zfs/stable/8/bin/ed/glbl.c#1 branch .. //depot/projects/zfs/stable/8/bin/ed/io.c#1 branch .. //depot/projects/zfs/stable/8/bin/ed/main.c#1 branch .. //depot/projects/zfs/stable/8/bin/ed/re.c#1 branch .. //depot/projects/zfs/stable/8/bin/ed/sub.c#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/=.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/README#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/TODO#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/a.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/a.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/a.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/a1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/a2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/addr.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/addr.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/addr.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/addr1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/addr2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/ascii.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/bang1.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/bang1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/bang1.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/bang1.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/bang2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/c.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/c.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/c.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/c1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/c2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/d.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/d.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/d.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/d.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e1.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e1.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e1.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e2.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e2.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e2.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e3.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e3.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e3.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e3.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e4.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e4.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/e4.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/f1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/f2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g1.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g1.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g1.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g2.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g2.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g2.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g3.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g3.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g3.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g3.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g4.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g4.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g4.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g5.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g5.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/g5.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/h.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/i.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/i.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/i.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/i1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/i2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/i3.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/j.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/j.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/j.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/k.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/k.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/k.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/k1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/k2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/k3.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/k4.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/l.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/l.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/l.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/m.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/m.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/m.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/m.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/n.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/n.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/n.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/nl.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/nl1.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/nl1.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/nl1.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/nl2.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/nl2.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/nl2.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/p.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/p.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/p.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/q.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/q.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/q.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/q1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r1.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r1.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r1.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r2.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r2.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r2.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r3.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r3.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/r3.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s1.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s1.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s1.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s10.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s2.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s2.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s2.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s3.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s3.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s3.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s3.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s4.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s5.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s6.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s7.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s8.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/s9.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t1.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t1.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t1.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t2.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t2.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/t2.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/u.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/u.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/u.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/u.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/v.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/v.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/v.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/w.d#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/w.r#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/w.t#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/w1.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/w2.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/w3.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/x.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/test/z.err#1 branch .. //depot/projects/zfs/stable/8/bin/ed/undo.c#1 branch .. //depot/projects/zfs/stable/8/bin/expr/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/expr/expr.1#1 branch .. //depot/projects/zfs/stable/8/bin/expr/expr.y#1 branch .. //depot/projects/zfs/stable/8/bin/getfacl/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/getfacl/getfacl.1#1 branch .. //depot/projects/zfs/stable/8/bin/getfacl/getfacl.c#1 branch .. //depot/projects/zfs/stable/8/bin/hostname/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/hostname/hostname.1#1 branch .. //depot/projects/zfs/stable/8/bin/hostname/hostname.c#1 branch .. //depot/projects/zfs/stable/8/bin/kenv/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/kenv/kenv.1#1 branch .. //depot/projects/zfs/stable/8/bin/kenv/kenv.c#1 branch .. //depot/projects/zfs/stable/8/bin/kill/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/kill/kill.1#1 branch .. //depot/projects/zfs/stable/8/bin/kill/kill.c#1 branch .. //depot/projects/zfs/stable/8/bin/ln/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/ln/ln.1#1 branch .. //depot/projects/zfs/stable/8/bin/ln/ln.c#1 branch .. //depot/projects/zfs/stable/8/bin/ln/symlink.7#1 branch .. //depot/projects/zfs/stable/8/bin/ls/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/ls/cmp.c#1 branch .. //depot/projects/zfs/stable/8/bin/ls/extern.h#1 branch .. //depot/projects/zfs/stable/8/bin/ls/ls.1#1 branch .. //depot/projects/zfs/stable/8/bin/ls/ls.c#1 branch .. //depot/projects/zfs/stable/8/bin/ls/ls.h#1 branch .. //depot/projects/zfs/stable/8/bin/ls/print.c#1 branch .. //depot/projects/zfs/stable/8/bin/ls/util.c#1 branch .. //depot/projects/zfs/stable/8/bin/mkdir/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/mkdir/mkdir.1#1 branch .. //depot/projects/zfs/stable/8/bin/mkdir/mkdir.c#1 branch .. //depot/projects/zfs/stable/8/bin/mv/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/mv/mv.1#1 branch .. //depot/projects/zfs/stable/8/bin/mv/mv.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/pax/ar_io.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/ar_subs.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/buf_subs.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/cache.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/cache.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/cpio.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/cpio.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/extern.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/file_subs.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/ftree.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/ftree.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/gen_subs.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/getoldopt.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/options.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/options.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/pat_rep.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/pat_rep.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/pax.1#1 branch .. //depot/projects/zfs/stable/8/bin/pax/pax.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/pax.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/sel_subs.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/sel_subs.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/tables.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/tables.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/tar.c#1 branch .. //depot/projects/zfs/stable/8/bin/pax/tar.h#1 branch .. //depot/projects/zfs/stable/8/bin/pax/tty_subs.c#1 branch .. //depot/projects/zfs/stable/8/bin/pkill/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/pkill/pkill.1#1 branch .. //depot/projects/zfs/stable/8/bin/pkill/pkill.c#1 branch .. //depot/projects/zfs/stable/8/bin/ps/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/ps/extern.h#1 branch .. //depot/projects/zfs/stable/8/bin/ps/fmt.c#1 branch .. //depot/projects/zfs/stable/8/bin/ps/keyword.c#1 branch .. //depot/projects/zfs/stable/8/bin/ps/nlist.c#1 branch .. //depot/projects/zfs/stable/8/bin/ps/print.c#1 branch .. //depot/projects/zfs/stable/8/bin/ps/ps.1#1 branch .. //depot/projects/zfs/stable/8/bin/ps/ps.c#1 branch .. //depot/projects/zfs/stable/8/bin/ps/ps.h#1 branch .. //depot/projects/zfs/stable/8/bin/pwait/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/pwait/pwait.1#1 branch .. //depot/projects/zfs/stable/8/bin/pwait/pwait.c#1 branch .. //depot/projects/zfs/stable/8/bin/pwd/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/pwd/pwd.1#1 branch .. //depot/projects/zfs/stable/8/bin/pwd/pwd.c#1 branch .. //depot/projects/zfs/stable/8/bin/rcp/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/rcp/extern.h#1 branch .. //depot/projects/zfs/stable/8/bin/rcp/rcp.1#1 branch .. //depot/projects/zfs/stable/8/bin/rcp/rcp.c#1 branch .. //depot/projects/zfs/stable/8/bin/rcp/util.c#1 branch .. //depot/projects/zfs/stable/8/bin/realpath/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/realpath/realpath.1#1 branch .. //depot/projects/zfs/stable/8/bin/realpath/realpath.c#1 branch .. //depot/projects/zfs/stable/8/bin/rm/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/rm/rm.1#1 branch .. //depot/projects/zfs/stable/8/bin/rm/rm.c#1 branch .. //depot/projects/zfs/stable/8/bin/rmail/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/rmdir/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/rmdir/rmdir.1#1 branch .. //depot/projects/zfs/stable/8/bin/rmdir/rmdir.c#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/file.c#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/mask.c#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/merge.c#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/remove.c#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/setfacl.1#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/setfacl.c#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/setfacl.h#1 branch .. //depot/projects/zfs/stable/8/bin/setfacl/util.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/sh/TOUR#1 branch .. //depot/projects/zfs/stable/8/bin/sh/alias.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/alias.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/arith.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/arith.y#1 branch .. //depot/projects/zfs/stable/8/bin/sh/arith_lex.l#1 branch .. //depot/projects/zfs/stable/8/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/bltin/echo.1#1 branch .. //depot/projects/zfs/stable/8/bin/sh/bltin/echo.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/builtins.def#1 branch .. //depot/projects/zfs/stable/8/bin/sh/cd.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/cd.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/error.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/error.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/eval.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/eval.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/exec.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/exec.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/expand.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/expand.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/funcs/cmv#1 branch .. //depot/projects/zfs/stable/8/bin/sh/funcs/dirs#1 branch .. //depot/projects/zfs/stable/8/bin/sh/funcs/kill#1 branch .. //depot/projects/zfs/stable/8/bin/sh/funcs/login#1 branch .. //depot/projects/zfs/stable/8/bin/sh/funcs/newgrp#1 branch .. //depot/projects/zfs/stable/8/bin/sh/funcs/popd#1 branch .. //depot/projects/zfs/stable/8/bin/sh/funcs/pushd#1 branch .. //depot/projects/zfs/stable/8/bin/sh/funcs/suspend#1 branch .. //depot/projects/zfs/stable/8/bin/sh/histedit.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/init.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/input.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/input.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/jobs.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/jobs.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mail.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mail.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/main.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/main.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/memalloc.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/memalloc.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/miscbltin.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mkbuiltins#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mkinit.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mknodes.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mksyntax.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mktokens#1 branch .. //depot/projects/zfs/stable/8/bin/sh/myhistedit.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mystring.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/mystring.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/nodes.c.pat#1 branch .. //depot/projects/zfs/stable/8/bin/sh/nodetypes#1 branch .. //depot/projects/zfs/stable/8/bin/sh/options.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/options.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/output.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/output.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/parser.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/parser.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/redir.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/redir.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/sh.1#1 branch .. //depot/projects/zfs/stable/8/bin/sh/shell.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/show.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/show.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/trap.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/trap.h#1 branch .. //depot/projects/zfs/stable/8/bin/sh/var.c#1 branch .. //depot/projects/zfs/stable/8/bin/sh/var.h#1 branch .. //depot/projects/zfs/stable/8/bin/sleep/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/sleep/sleep.1#1 branch .. //depot/projects/zfs/stable/8/bin/sleep/sleep.c#1 branch .. //depot/projects/zfs/stable/8/bin/stty/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/stty/cchar.c#1 branch .. //depot/projects/zfs/stable/8/bin/stty/extern.h#1 branch .. //depot/projects/zfs/stable/8/bin/stty/gfmt.c#1 branch .. //depot/projects/zfs/stable/8/bin/stty/key.c#1 branch .. //depot/projects/zfs/stable/8/bin/stty/modes.c#1 branch .. //depot/projects/zfs/stable/8/bin/stty/print.c#1 branch .. //depot/projects/zfs/stable/8/bin/stty/stty.1#1 branch .. //depot/projects/zfs/stable/8/bin/stty/stty.c#1 branch .. //depot/projects/zfs/stable/8/bin/stty/stty.h#1 branch .. //depot/projects/zfs/stable/8/bin/stty/util.c#1 branch .. //depot/projects/zfs/stable/8/bin/sync/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/sync/sync.8#1 branch .. //depot/projects/zfs/stable/8/bin/sync/sync.c#1 branch .. //depot/projects/zfs/stable/8/bin/test/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/test/TEST.README#1 branch .. //depot/projects/zfs/stable/8/bin/test/TEST.csh#1 branch .. //depot/projects/zfs/stable/8/bin/test/TEST.sh#1 branch .. //depot/projects/zfs/stable/8/bin/test/test.1#1 branch .. //depot/projects/zfs/stable/8/bin/test/test.c#1 branch .. //depot/projects/zfs/stable/8/bin/uuidgen/Makefile#1 branch .. //depot/projects/zfs/stable/8/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/zfs/stable/8/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/zfs/stable/8/cddl/Makefile#1 branch .. //depot/projects/zfs/stable/8/cddl/Makefile.inc#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/zfs/stable/8/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch .. //depot/projects/zfs/stable/8/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 22 21:04:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 325D0106566C; Tue, 22 Jun 2010 21:04:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA9BE106564A for ; Tue, 22 Jun 2010 21:04:37 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D758F8FC16 for ; Tue, 22 Jun 2010 21:04:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5ML4brL083003 for ; Tue, 22 Jun 2010 21:04:37 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5ML4bVq083001 for perforce@freebsd.org; Tue, 22 Jun 2010 21:04:37 GMT (envelope-from afiveg@FreeBSD.org) Date: Tue, 22 Jun 2010 21:04:37 GMT Message-Id: <201006222104.o5ML4bVq083001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 21:04:38 -0000 http://p4web.freebsd.org/@@180124?ac=10 Change 180124 by afiveg@cottonmouth on 2010/06/22 21:04:14 Begin to port ringmap-libpcap to current. + tests Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#2 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#2 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#2 edit .. //depot/projects/soc2010/ringmap/current/lib/libpcap/Makefile#3 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#9 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#7 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#7 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#5 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#7 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#11 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#11 edit .. //depot/projects/soc2010/ringmap/tests/libpcap/Makefile#1 add .. //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#1 add .. //depot/projects/soc2010/ringmap/tests/libpcap/test_pcap.c#1 add .. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#2 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#2 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#3 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#3 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#3 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#2 (text+ko) ==== @@ -161,6 +161,11 @@ #define DLT_IEEE802_11_RADIO_AVS 163 #endif +#ifdef RINGMAP +#include +#include "../../sys/net/ringmap.h" +#endif + static int pcap_can_set_rfmon_bpf(pcap_t *p); static int pcap_activate_bpf(pcap_t *p); static int pcap_setfilter_bpf(pcap_t *p, struct bpf_program *fp); @@ -1330,6 +1335,10 @@ struct bpf_program total_prog; struct utsname osinfo; +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG (start); +#endif + #ifdef HAVE_DAG_API if (strstr(device, "dag")) { return dag_open_live(device, snaplen, promisc, to_ms, ebuf); @@ -1349,6 +1358,9 @@ status = fd; goto bad; } +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(BPF device is opened); +#endif p->fd = fd; @@ -1467,6 +1479,11 @@ } #endif /* __APPLE__ */ #ifdef HAVE_ZEROCOPY_BPF + +#ifdef RINGMAP + /* only for debug goals */ + RINGMAP_FUNC_DEBUG(have zerocopy BPF); +#endif /* * If the BPF extension to set buffer mode is present, try setting * the mode to zero-copy. If that fails, use regular buffering. If @@ -1624,6 +1641,10 @@ goto bad; } +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(BIOCGDLT syscall done); +#endif + #ifdef _AIX /* * AIX's BPF returns IFF_ types, not DLT_ types, in BIOCGDLT. @@ -1778,6 +1799,9 @@ } } #elif defined(HAVE_BSD_IEEE80211) +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(2); +#endif /* * *BSD with the new 802.11 ioctls. * Do we want monitor mode? @@ -2064,8 +2088,14 @@ p->stats_op = pcap_stats_bpf; p->cleanup_op = pcap_cleanup_bpf; +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(end: Ok); +#endif return (status); bad: +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(failed); +#endif pcap_cleanup_bpf(p); return (status); } ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#2 (text+ko) ==== @@ -331,6 +331,10 @@ u_int *dlt_list; struct pcap_pkthdr pcap_header; /* This is needed for the pcap_next_ex() to work */ + +#ifdef RINGMAP + struct ring *ring; +#endif }; /* ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#2 (text+ko) ==== @@ -71,6 +71,15 @@ #include #endif +#ifdef RINGMAP +#include +#include "../../sys/net/ringmap.h" + +extern int check_module(const char *); +extern int init_mmapped_capturing(const char *device, pcap_t *); +#endif + + int pcap_not_initialized(pcap_t *pcap) { @@ -229,6 +238,10 @@ pcap_t *p; int status; +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(start); +#endif + p = pcap_create(source, errbuf); if (p == NULL) return (NULL); @@ -241,6 +254,11 @@ status = pcap_set_timeout(p, to_ms); if (status < 0) goto fail; + +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(pcap is allocated); +#endif + /* * Mark this as opened with pcap_open_live(), so that, for * example, we show the full list of DLT_ values, rather @@ -255,6 +273,16 @@ status = pcap_activate(p); if (status < 0) goto fail; + +#ifdef RINGMAP + if (check_module(source) < 0){ + goto fail; + } + if (init_mmapped_capturing(source, p) < 0){ + goto fail; + } +#endif + return (p); fail: if (status == PCAP_ERROR || status == PCAP_ERROR_NO_SUCH_DEVICE || ==== //depot/projects/soc2010/ringmap/current/lib/libpcap/Makefile#3 (text+ko) ==== @@ -12,8 +12,8 @@ scanner.l version.c .if defined(LIBPCAP_RINGMAP) -CFLAGS+=-D__RINGMAP__ -D__E1000_RINGMAP__ -SRC+=ringmap_pcap.c +CFLAGS+=-g -DRINGMAP +SRCS+=ringmap_pcap.c .endif # Old compatibility headers ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#9 (text+ko) ==== @@ -1382,9 +1382,18 @@ struct ifnet *ifp = adapter->ifp; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { +#ifdef RINGMAP + if ((adapter->rm != NULL) && (adapter->rm->ring != NULL)) + adapter->rm->funcs->delayed_interrupt(context); +#endif if (lem_rxeof(adapter, adapter->rx_process_limit) != 0) taskqueue_enqueue(adapter->tq, &adapter->rxtx_task); +#ifdef RINGMAP + if (adapter->rm != NULL) + wakeup(adapter->rm); +#endif + #if (RINGMAP_TX_ENABLE) EM_TX_LOCK(adapter); lem_txeof(adapter); ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#7 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#7 (text+ko) ==== @@ -26,14 +26,31 @@ int rm_8254_set_slot(struct ring *, struct adapter *, unsigned int); void rm_8254_print_slot(struct ring *, unsigned int); void rm_8254_interrupt(void *); +void rm_8254_delayed_interrupt(void *); int rm_8254_print_ring_pointers(struct adapter *); +void rm_8254_sync_head_tail(device_t, struct ring *); extern devclass_t em_devclass; extern void lem_enable_intr(struct adapter *); extern void lem_disable_intr(struct adapter *); +void +rm_8254_sync_head_tail(device_t dev, struct ring *ring) +{ + struct adapter *adapter; + adapter = (struct adapter *)device_get_softc(dev); + + ring->kernrp = RINGMAP_HW_READ_HEAD(adapter); + RINGMAP_HW_WRITE_TAIL(adapter, ring); + adapter->rm->ring->hw_RDT = ring->userrp; +} + +/* + * This should be called from ISR. Other interrupts are disallowed! + * It means the functions must be as small as possible + */ void rm_8254_interrupt(void *arg) { @@ -47,6 +64,29 @@ } +void +rm_8254_delayed_interrupt(void *context) +{ + struct adapter *adapter = (struct adapter *)context; + + RINGMAP_INTR(start); + + /* + * synchronize HEAD and TAIL with userrp and kernrp + * TODO: we want multithreading, it means we should later + * sync not one ring but many rings, each per thread + */ + rm_8254_sync_head_tail(adapter->dev, adapter->rm->ring); + + +#ifdef RINGMAP_TIMESTAMP + +#endif + + RINGMAP_INTR(end); +} + + /* * Get adapter structure of device and initialize the * pointers in ring (mbufs, packets, decriptors) with values @@ -101,6 +141,7 @@ return (0); } + int rm_8254_set_slot(struct ring *ring, struct adapter *adapter, unsigned int slot_num) @@ -150,6 +191,7 @@ return (-1); } + void rm_8254_print_slot(struct ring *ring, unsigned int slot_number) { @@ -243,6 +285,7 @@ return (0); } + /* * Returns pointer to ringmap structure */ ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#5 (text+ko) ==== @@ -18,10 +18,14 @@ /* Registers access */ #define RINGMAP_HW_READ_REG E1000_READ_REG +#define RINGMAP_HW_WRITE_REG E1000_WRITE_REG #define RINGMAP_HW_READ_HEAD(adapter) \ RINGMAP_HW_READ_REG(&adapter->hw, E1000_RDH(0)) +#define RINGMAP_HW_WRITE_TAIL(adapter, ring) \ + RINGMAP_HW_WRITE_REG(&adapter->hw, E1000_RDT(0), ring->userrp) + #define RINGMAP_HW_READ_TAIL(adapter) \ RINGMAP_HW_READ_REG(&adapter->hw, E1000_RDT(0)) ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#7 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#11 (text+ko) ==== @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -30,13 +31,6 @@ #include /* For pci_get macros! */ #include -//extern devclass_t em_devclass; -//extern int em_rxeof(struct rx_ring *, int); -//extern bool em_txeof(struct tx_ring *); -//extern void em_print_debug_info(struct adapter *); -//extern void em_start_locked(struct ifnet *, struct tx_ring *); -//#endif - #include "ringmap.h" int ringmap_attach (device_t); @@ -54,26 +48,15 @@ extern device_t rm_8254_get_device_p(struct cdev *); extern void rm_8254_enable_intr(device_t); extern void rm_8254_disable_intr(device_t); -extern void rm_8254_interrupt(struct ringmap *); +extern void rm_8254_interrupt(void *); +extern void rm_8254_delayed_interrupt(void *); +extern void rm_8254_sync_head_tail(device_t, struct ring *); -//struct adapter* get_adapter_struct(struct cdev *dev); -//int ringmap_print_ring_pointers(struct adapter *); -//void ringmap_print_ring (struct adapter *adapter, int level); -//void ringmap_print_slot(struct adapter *adapter, unsigned int slot_number); - -//#if (__DRIVER_VERSION == 696) -//void ringmap_handle_rxtx(void *context, int pending); -//#endif -// -///* For CURRENT */ -//void ringmap_handle_que(void *context, int pending); -// d_open_t ringmap_open; d_close_t ringmap_close; d_ioctl_t ringmap_ioctl; d_mmap_t ringmap_mmap; - /* * Character Device for access on if_em driver structures */ @@ -129,10 +112,12 @@ /* Set ringmap pointer in the drivrs structure of adapter */ rm->funcs->set_ringmap_to_adapter = rm_8254_set_ringmap_to_adapter; - rm->funcs->enable_intr = rm_8254_enable_intr; - rm->funcs->disable_intr = rm_8254_disable_intr; - rm->funcs->init_slots = rm_8254_init_slots; - rm->funcs->interrupt = rm_8254_interrupt; + rm->funcs->enable_intr = rm_8254_enable_intr; + rm->funcs->disable_intr = rm_8254_disable_intr; + rm->funcs->init_slots = rm_8254_init_slots; + rm->funcs->interrupt = rm_8254_interrupt; + rm->funcs->sync_head_tail = rm_8254_sync_head_tail; + rm->funcs->delayed_interrupt = rm_8254_delayed_interrupt; get_ringmap_p = rm_8254_get_ringmap_p; get_device_p = rm_8254_get_device_p; @@ -368,8 +353,10 @@ RINGMAP_FUNC_DEBUG(start); + /* Get pointer to the ringmap structure */ rm = get_ringmap_p(get_device_p(cdev)); + /* Check pointers: rm and rm->ring should be allocated */ if (rm == NULL){ RINGMAP_ERROR(Can not get pointer to ringmap structure); return (ENXIO); @@ -378,6 +365,8 @@ RINGMAP_ERROR(Can not get pointer to ring structure); return (ENXIO); } + + /* Check protections */ if (nprot & PROT_EXEC) { RINGMAP_WARN("PROT_EXEC ist set"); return (ERESTART); @@ -392,18 +381,21 @@ int -ringmap_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td) +ringmap_ioctl (struct cdev *cdev, u_long cmd, caddr_t data, + int fflag, struct thread *td) { int err = 0, err_sleep = err_sleep; + struct ringmap *ringmap = NULL; + // struct adapter *adapter = (struct adapter *)get_adapter_struct(dev); // struct ringmap *rm = adapter->rm; // // unsigned int *userp = NULL; // - RINGMAP_FUNC_DEBUG(start); + RINGMAP_IOCTL(start); + + switch( cmd ){ // -// switch( cmd ){ -// // /* Tell to user number of descriptors */ // case IOCTL_G_DNUM: // RINGMAP_OUTPUT(IOCTL_G_DNUM); @@ -439,149 +431,44 @@ // RINGMAP_HW_DISABLE_FLOWCONTR(adapter); // break; // -// /* Sleep and wait for new frames */ -// case IOCTL_SLEEP_WAIT: -// rm->ring->user_wait_kern++; -// RINGMAP_HW_SYNC_TAIL(adapter); -// err_sleep = tsleep(rm, (PRI_MIN) | PCATCH, "ioctl", hz); -// break; -// -// /* Synchronize sowftware ring-tail with hardware-ring-tail (RDT) */ -// case IOCTL_SET_RDT: -// SET_RDT(adapter); -// break; -// -// default: -// RINGMAP_ERROR("Undefined command!"); -// return (ENODEV); -// } + /* Sleep and wait for new frames */ + case IOCTL_SLEEP_WAIT: + /* TODO: use private data to set and get ring from curr. thread */ + ringmap = get_ringmap_p(get_device_p(cdev)); + if ((ringmap != NULL) && (ringmap->ring != NULL)){ + ringmap->ring->user_wait_kern++; + ringmap->funcs->sync_head_tail(get_device_p(cdev), + ringmap->ring); + err_sleep = tsleep(ringmap, (PRI_MIN) | PCATCH, "ioctl", 0); + } else { + RINGMAP_ERROR(NULL pointer. ioctl can not be accomplished); + + /* TODO: look if ENODEV is a correctly for this case */ + return(ENODEV); + } + break; + + /* Synchronize sowftware ring-tail with hardware-ring-tail (RDT) */ + case IOCTL_SYNC_HEAD_TAIL: + /* TODO: use private data to set and get ring from curr. thread */ + ringmap = get_ringmap_p(get_device_p(cdev)); + if ((ringmap != NULL) && (ringmap->ring != NULL)){ + ringmap->funcs->sync_head_tail(get_device_p(cdev), + ringmap->ring); + } else { + RINGMAP_ERROR(NULL pointer. ioctl can not be accomplished); + + /* TODO: look if ENODEV is a correctly for this case */ + return(ENODEV); + } + break; + + default: + RINGMAP_ERROR("Undefined command!"); + return (ENODEV); + } - RINGMAP_FUNC_DEBUG(end); + RINGMAP_IOCTL(end); return (err); } - -//void -//ringmap_handle_que(void *context, int pending) -//{ -// struct adapter *adapter = context; -// struct ringmap *rm = adapter->rm; -// struct ifnet *ifp = adapter->ifp; -// struct tx_ring *txr = adapter->tx_rings; -// struct rx_ring *rxr = adapter->rx_rings; -// bool more_rx; -// -//#if (INTR_DEB) -// printf("########################################################################\n"); -//#endif -// -// if (ifp->if_drv_flags & IFF_DRV_RUNNING) { -// more_rx = em_rxeof(rxr, adapter->rx_process_limit); -// -// EM_TX_LOCK(txr); -// em_txeof(txr); -//#ifdef EM_MULTIQUEUE -// if (!drbr_empty(ifp, txr->br)) -// em_mq_start_locked(ifp, txr, NULL); -//#else -// if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) -// em_start_locked(ifp, txr); -//#endif -// EM_TX_UNLOCK(txr); -// if (more_rx) { -// taskqueue_enqueue(adapter->tq, &adapter->que_task); -// return; -// } -// } -// -//#if (INTR_DEB) -// printf("########################################################################\n"); -//#endif -// -// RINGMAP_HW_ENABLE_INTR(adapter); -// -// if (rm->procp != NULL) { -// wakeup(rm); -// } -// -// return; -//} -// -//#if (__DRIVER_VERSION == 696) -//void -//ringmap_handle_rxtx(void *context, int pending) -//{ -// struct adapter *adapter = context; -// struct ifnet *ifp = adapter->ifp; -// struct ringmap *rm = adapter->rm; -// -//#if (INTR_DEB) -// printf("########################################################################\n"); -//#endif -// -// if (ifp->if_drv_flags & IFF_DRV_RUNNING) { -//#ifdef __E1000_RINGMAP__ -// if (em_rxeof(adapter, adapter->rx_process_limit) != 0) -// taskqueue_enqueue(adapter->tq, &adapter->rxtx_task); -//#endif -// } -// -//#if (INTR_DEB) -// printf("########################################################################\n\n"); -//#endif -// -// RINGMAP_HW_ENABLE_INTR(adapter); -// -// if (rm->procp != NULL) { -// wakeup(rm); -// } -//} -//#endif -// -//struct adapter* -// -//get_adapter_struct(struct cdev *dev) -//{ -// struct adapter *adapter; -// -// adapter = RINGMAP_GET_ADAPTER_STRUCT(adapter); -// return (adapter); -//} -// -// -//void -//ringmap_print_ring (struct adapter *adapter, int level) -//{ -// struct ringmap *rm = adapter->rm; -// -// printf("Ring Size = %d \n",rm->ring->size ); -// printf("Times Kern wait for User = %llu \n",rm->ring->kern_wait_user); -// printf("Times User wait for Kern = %llu \n",rm->ring->user_wait_kern); -// printf("Interrupts Counter = %llu \n",rm->ring->interrupts_counter); -// -// ringmap_print_ring_pointers(adapter); -//} -// -// -//void -//ringmap_print_slot(struct adapter *adapter, unsigned int slot_number) -//{ -// struct ringmap *rm = adapter->rm; -// -// printf("Slot Number: %d \n", slot_number); -// printf("---------------- \n"); -// -// printf("[%s] physical addr of descriptor[%d] = 0x%X\n", __func__, slot_number, -// (unsigned int) rm->ring->slot[slot_number].descriptor.phys); -// printf("[%s] kernel addr of descriptor[%d] = 0x%X\n", __func__, slot_number, -// (unsigned int) rm->ring->slot[slot_number].descriptor.kern); -// printf("[%s] physical addr of mbuf[%d] = 0x%X\n", __func__, slot_number, -// (unsigned int) rm->ring->slot[slot_number].mbuf.phys); -// printf("[%s] kernel addr of mbuf[%d] = 0x%X\n", __func__, slot_number, -// (unsigned int) rm->ring->slot[slot_number].mbuf.kern); -// printf("[%s] physical addr of packet_buffer[%d] = 0x%X\n", __func__, slot_number, -// (unsigned int) rm->ring->slot[slot_number].packet.phys); -// printf("[%s] kernel addr of packet_buffer[%d] = 0x%X\n", __func__, slot_number, -// (unsigned int) rm->ring->slot[slot_number].packet.kern); -// printf(" \n"); -//} ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#11 (text+ko) ==== @@ -43,9 +43,12 @@ struct address mbuf; struct address packet; - /** - ** Next fields are for statistics: - **/ + /* 1 - if accepted by (bpf) filter */ + int filtered; + + /* + * Next fields are for statistics: + */ /* Time stamp of packet which placed in the slot */ struct timeval ts; @@ -143,7 +146,9 @@ void (*enable_intr)(device_t); void (*disable_intr)(device_t); int (*init_slots)(struct ring *, device_t); - void (*interrupt)(struct ringmap*); + void (*interrupt)(void *); + void (*delayed_interrupt)(void *); + void (*sync_head_tail)(device_t, struct ring *); }; #endif /* _KERNEL */ @@ -157,9 +162,6 @@ * *************************************/ #define RINGMAP_IOC_MAGIC 'T' -/* Number of descs (a.k.a. slots in ring buffer) */ -#define IOCTL_G_DNUM _IOWR(RINGMAP_IOC_MAGIC, 1, unsigned int) - /* Start capturing. Enable packets receive and interrupts on NIC */ #define IOCTL_ENABLE_RECEIVE _IO(RINGMAP_IOC_MAGIC, 3) @@ -173,7 +175,7 @@ #define IOCTL_DISABLE_FLOWCNTR _IO(RINGMAP_IOC_MAGIC, 6) /* RDT = (userrp - RING_SAFETY_MARGIN) mod SLOTS_NUMBER */ -#define IOCTL_SET_RDT _IO(RINGMAP_IOC_MAGIC, 2) +#define IOCTL_SYNC_HEAD_TAIL _IO(RINGMAP_IOC_MAGIC, 2) /********************************************** * Arithmetic in Ring Buffer @@ -240,10 +242,10 @@ /* * DEBUG OUTPUT */ -#ifndef IOCTL_DEB -#define IOCTL_DEB 0 +#ifndef RINGMAP_IOCTL_DEB +#define RINGMAP_IOCTL_DEB 1 #else -#define IOCTL_DEB 1 +#define RINGMAP_IOCTL_DEB 1 #endif #ifndef RINGMAP_INTR_DEB @@ -260,12 +262,26 @@ #define ERR_PREFIX "--> RINGMAP ERROR: " #define WARN_PREFIX "--> RINGMAP WARN: " -#define RINGMAP_ERROR(x) printf("---> RINGMAP ERROR: [%s]: " #x "\n", __func__); -#define RINGMAP_IOCTL(x) if (IOCTL_DEB) printf(" --> RINGMAP IOCTL: " #x "\n"); -#define RINGMAP_INTR(x) if (INTR_DEB) printf("[%s] --> RINGMAP INTR: " #x "\n", __func__); -#define RINGMAP_FUNC_DEBUG(x) if (__RINGMAP_DEB) printf("[%s] --> RINGMAP FUNC: " #x "\n", __func__); -#define RINGMAP_OUTPUT(x) if (__RINGMAP_DEB) printf("--> RINGMAP: [%s]: " #x "\n", __func__); -#define RINGMAP_WARN(x) if (__RINGMAP_DEB) printf("--> WARN: [%s]: " #x "\n", __func__); +#define RINGMAP_ERROR(x) \ + printf("---> RINGMAP ERROR: [%s]: " #x "\n", __func__); + +#define RINGMAP_IOCTL(x) \ + if (RINGMAP_IOCTL_DEB) printf(" --> RINGMAP IOCTL: " #x "\n"); + +#define RINGMAP_INTR(x) \ + if (RINGMAP_INTR_DEB) \ + printf("[%s] --> RINGMAP INTR: " #x "\n", __func__); + +#define RINGMAP_FUNC_DEBUG(x) \ + if (__RINGMAP_DEB) printf("[%s] --> RINGMAP FUNC: " #x "\n", __func__); + +#define RINGMAP_OUTPUT(x) \ + if (__RINGMAP_DEB) printf("--> RINGMAP: [%s]: " #x "\n", __func__); + +#define RINGMAP_WARN(x) \ + if (__RINGMAP_DEB) printf("--> WARN: [%s]: " #x "\n", __func__); + + #ifdef _KERNEL #define RINGMAP_PRINT_DESC(i) \ ==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#2 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#2 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#3 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#3 (text+ko) ==== @@ -47,5 +47,7 @@ printf("Size of ring = %d \n", r->size); + sleep(20); + return (0); } ==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 22 23:42:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 740751065686; Tue, 22 Jun 2010 23:42:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3877F106567D for ; Tue, 22 Jun 2010 23:42:32 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 258318FC19 for ; Tue, 22 Jun 2010 23:42:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MNgWC3097326 for ; Tue, 22 Jun 2010 23:42:32 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5MNgWus097324 for perforce@freebsd.org; Tue, 22 Jun 2010 23:42:32 GMT (envelope-from afiveg@FreeBSD.org) Date: Tue, 22 Jun 2010 23:42:32 GMT Message-Id: <201006222342.o5MNgWus097324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180133 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 23:42:32 -0000 http://p4web.freebsd.org/@@180133?ac=10 Change 180133 by afiveg@cottonmouth on 2010/06/22 23:42:15 ringmap is ported to current. Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#3 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#3 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#8 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#6 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#12 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#12 edit .. //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#2 edit .. //depot/projects/soc2010/ringmap/tests/libpcap/test_pcap.c#2 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#3 (text+ko) ==== @@ -164,6 +164,8 @@ #ifdef RINGMAP #include #include "../../sys/net/ringmap.h" +extern void uninit_mmapped_capturing(pcap_t *); +extern int pcap_read_ringmap(pcap_t *, int, pcap_handler, u_char *); #endif static int pcap_can_set_rfmon_bpf(pcap_t *p); @@ -214,6 +216,9 @@ static void pcap_cleanup_zbuf(pcap_t *p) { +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(start); +#endif /* * Delete the mappings. Note that p->buffer gets initialized to one * of the mmapped regions in this case, so do not try and free it @@ -1140,6 +1145,11 @@ struct ifreq ifr; #endif +#ifdef RINGMAP + RINGMAP_FUNC_DEBUG(start); + + uninit_mmapped_capturing(p); +#endif if (p->md.must_clear != 0) { /* * There's something we have to do when closing this @@ -1641,9 +1651,6 @@ goto bad; } -#ifdef RINGMAP - RINGMAP_FUNC_DEBUG(BIOCGDLT syscall done); -#endif #ifdef _AIX /* @@ -1799,9 +1806,6 @@ } } #elif defined(HAVE_BSD_IEEE80211) -#ifdef RINGMAP - RINGMAP_FUNC_DEBUG(2); -#endif /* * *BSD with the new 802.11 ioctls. * Do we want monitor mode? @@ -2078,7 +2082,11 @@ } } +#ifndef RINGMAP p->read_op = pcap_read_bpf; +#else + p->read_op = pcap_read_ringmap; +#endif p->inject_op = pcap_inject_bpf; p->setfilter_op = pcap_setfilter_bpf; p->setdirection_op = pcap_setdirection_bpf; ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#3 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#8 (text+ko) ==== @@ -42,7 +42,7 @@ adapter = (struct adapter *)device_get_softc(dev); ring->kernrp = RINGMAP_HW_READ_HEAD(adapter); - RINGMAP_HW_WRITE_TAIL(adapter, ring); + RINGMAP_HW_SYNC_TAIL(adapter, ring); adapter->rm->ring->hw_RDT = ring->userrp; } @@ -126,8 +126,11 @@ ring->kern_wait_user = 0; ring->user_wait_kern = 0; ring->interrupts_counter = 0; + RINGMAP_HW_WRITE_TAIL(adapter, SLOTS_NUMBER - 1); + ring->userrp = RINGMAP_HW_READ_TAIL(adapter); ring->size = SLOTS_NUMBER; + /* Set ring pointers */ for (slot_num = 0 ; slot_num < SLOTS_NUMBER ; slot_num ++){ if (rm_8254_set_slot(ring, adapter, slot_num) == -1){ ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#6 (text+ko) ==== @@ -20,12 +20,17 @@ #define RINGMAP_HW_READ_REG E1000_READ_REG #define RINGMAP_HW_WRITE_REG E1000_WRITE_REG + + #define RINGMAP_HW_READ_HEAD(adapter) \ RINGMAP_HW_READ_REG(&adapter->hw, E1000_RDH(0)) -#define RINGMAP_HW_WRITE_TAIL(adapter, ring) \ +#define RINGMAP_HW_SYNC_TAIL(adapter, ring) \ RINGMAP_HW_WRITE_REG(&adapter->hw, E1000_RDT(0), ring->userrp) - + +#define RINGMAP_HW_WRITE_TAIL(adapter, val) \ + RINGMAP_HW_WRITE_REG(&adapter->hw, E1000_RDT(0), val) + #define RINGMAP_HW_READ_TAIL(adapter) \ RINGMAP_HW_READ_REG(&adapter->hw, E1000_RDT(0)) ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#12 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#12 (text+ko) ==== @@ -206,11 +206,20 @@ /* Distance from KERN to USER pointer */ #define KERN_TO_USER_RING_DISTANCE(ringp) \ - (((ringp)->userrp == (ringp)->kernrp) ? SLOTS_NUMBER : R_DISTANCE((ringp)->kernrp, (ringp)->userrp, SLOTS_NUMBER)) + (((ringp)->userrp == (ringp)->kernrp) ? 0 : R_DISTANCE((ringp)->kernrp, (ringp)->userrp, SLOTS_NUMBER)) /* Distance from USER to KERN pointer */ #define USER_TO_KERN_RING_DISTANCE(ringp) \ - (R_DISTANCE((ringp)->userrp, (ringp)->kernrp, SLOTS_NUMBER)) + (((ringp)->userrp == (ringp)->kernrp) ? SLOTS_NUMBER : R_DISTANCE((ringp)->userrp, (ringp)->kernrp, SLOTS_NUMBER)) + +#define RING_IS_EMPTY(ringp) \ + ((USER_TO_KERN_RING_DISTANCE(ringp)) == 1) + +#define RING_NOT_EMPTY(ringp) \ + ((USER_TO_KERN_RING_DISTANCE(ringp)) > 1) + +#define RING_IS_FULL(ringp) \ + ((KERN_TO_USER_RING_DISTANCE(ringp)) == 0) /* Increment of USER pointer. (KERN pointer is incremented by Hardware) */ #define INC_USER_POINTER(ringp) \ ==== //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#2 (text+ko) ==== @@ -17,11 +17,15 @@ int capture_pkts (const char*); +void got_packet(u_char *, const struct pcap_pkthdr *, const u_char *); pcap_t *handle; +#define HOWMANY 20 + + int main(int argc, char **argv) { @@ -49,9 +53,20 @@ fprintf(stderr, "pcap handle = NULL!: %s\n", errbuf); return (-1); } + + pcap_loop(handle, HOWMANY, got_packet, NULL); if (handle != NULL) pcap_close(handle); return (0); } + +/* + * Callback function. Will called for each captured packet + */ +void +got_packet(u_char *args, const struct pcap_pkthdr *header, const u_char *packet) +{ + printf("got :) \n"); +} ==== //depot/projects/soc2010/ringmap/tests/libpcap/test_pcap.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jun 23 00:11:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24CCB106564A; Wed, 23 Jun 2010 00:11:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A674C1065675 for ; Wed, 23 Jun 2010 00:11:03 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B20D8FC1E for ; Wed, 23 Jun 2010 00:11:03 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5N0B3CR000983 for ; Wed, 23 Jun 2010 00:11:03 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5N0B363000981 for perforce@freebsd.org; Wed, 23 Jun 2010 00:11:03 GMT (envelope-from afiveg@FreeBSD.org) Date: Wed, 23 Jun 2010 00:11:03 GMT Message-Id: <201006230011.o5N0B363000981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 00:11:04 -0000 http://p4web.freebsd.org/@@180134?ac=10 Change 180134 by afiveg@cottonmouth on 2010/06/23 00:10:24 forgotten ringmap_libpcap.c added Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 23 00:56:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A6321065672; Wed, 23 Jun 2010 00:56:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E22D106564A for ; Wed, 23 Jun 2010 00:56:54 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D766B8FC0C for ; Wed, 23 Jun 2010 00:56:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5N0ur4F015193 for ; Wed, 23 Jun 2010 00:56:53 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5N0urs3015191 for perforce@freebsd.org; Wed, 23 Jun 2010 00:56:53 GMT (envelope-from bfiedler@FreeBSD.org) Date: Wed, 23 Jun 2010 00:56:53 GMT Message-Id: <201006230056.o5N0urs3015191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 00:56:54 -0000 http://p4web.freebsd.org/@@180136?ac=10 Change 180136 by bfiedler@freebsd-7803 on 2010/06/23 00:56:51 Add Eflag Affected files ... .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#4 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#4 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#4 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#4 (text+ko) ==== @@ -48,7 +48,7 @@ int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; int sflag, tflag, Tflag, wflag, uniflag, yflag, strip_cr, tabsize=8; -int horizon; +int horizon, Eflag; int format, status; int fcase_behave = FCASE_SENSITIVE; unsigned long long context; @@ -76,11 +76,11 @@ LLF_OPT, TSIZE_OPT, HLINES_OPT, - OPT_LFILES, + LFILES_OPT, }; -#define OPTIONS "0123456789abBC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:y" +#define OPTIONS "0123456789abBC:cdD:eEfhI:iL:lnNPpqrS:sTtU:uvwX:x:y" static struct option longopts[] = { { "ignore-file-name-case", no_argument, NULL, FCASE_IGNORE_OPT }, { "no-ignore-file-name-case", no_argument, NULL, FCASE_SENSITIVE_OPT }, @@ -91,15 +91,15 @@ { "from-file", required_argument, NULL, FROMFILE_OPT }, { "to-file", required_argument, NULL, TOFILE_OPT }, { "help", no_argument, NULL, HELP_OPT }, - { "horizon-lines", required_argument, NULL, HORIZ_OPT}, + { "horizon-lines", required_argument, NULL, HORIZ_OPT }, { "text", no_argument, NULL, 'a' }, { "ignore-blank-lines", no_argument, NULL, 'B' }, { "ignore-space-change", no_argument, NULL, 'b' }, { "context", optional_argument, NULL, 'C' }, { "ifdef", required_argument, NULL, 'D' }, { "minimal", no_argument, NULL, 'd' }, -/* XXX: UNIMPLEMENTED - { "ignore-tab-expansion", no_argument, NULL, 'E' }, */ +/* XXX: UNIMPLEMENTED */ + { "ignore-tab-expansion", no_argument, NULL, 'E' }, { "ed", no_argument, NULL, 'e' }, { "forward-ed", no_argument, NULL, 'f' }, { "ignore-matching-lines", required_argument, NULL, 'I' }, @@ -123,16 +123,17 @@ { "exclude", required_argument, NULL, 'x' }, { "speed-large-files", no_argument, NULL, NOOP_OPT }, +/* options to be forwarded to sdiff */ { "side-by-side", no_argument, NULL, 'y' }, + { "width", optional_argument, NULL, 'W' }, + { "left-column", no_argument, NULL, LEFTC_OPT }, + { "suppress-common-lines", no_argument, NULL, SUPCL_OPT }, + /* XXX: the following are not very well documented and rarely used. If we need them at all, we will need to dig into the code to see what do they do actually. - { "left-column", no_argument, NULL, NOOP_OPT }, { "line-format", required_argument, NULL, NOOP_OPT }, { "show-function-line", required_argument, NULL, 'F' }, - { "side-by-side", no_argument, NULL, 'y' }, - { "suppress-common-lines", no_argument, NULL, NOOP_OPT }, - { "width", optional_argument, NULL, 'W' }, { "unchanged-group-format", required_argument, NULL, NOOP_OPT }, { "old-group-format", required_argument, NULL, NOOP_OPT }, { "new-group-format", required_argument, NULL, NOOP_OPT }, @@ -212,6 +213,9 @@ case 'd': dflag = 1; break; + case 'E': + Eflag = 1; + break; case 'e': format = D_EDIT; break; ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#4 (text+ko) ==== @@ -83,7 +83,7 @@ }; extern int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, - sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize; + sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize, Eflag; extern int format, status, horizon; extern int fcase_behave; extern unsigned long long context; ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#4 (text+ko) ==== @@ -694,7 +694,7 @@ static void check(FILE *f1, FILE *f2) { - int i, j, jackpot, a, b; + int i, j, jackpot, a, b, newcol; wint_t c, d; long ctold, ctnew; wchar_t *strc, *strd; @@ -762,7 +762,20 @@ ctnew++; } } + newcol = ((b/8)+1)*8; + while ((Eflag) && (c == L'\t') && (d == L' ') && b <= newcol ) + d = strd[++b]; + + newcol = ((a/8)+1)*8; + while ((Eflag) && (d == L'\t') && (c == L' ') && a <= newcol ) + c = strc[++a]; + if (Eflag && d == L'\t') + d = strd[++b]; + if (Eflag && c == L'\t') + c = strc[++a]; + + if (c != d) { // jackpot++; J[i] = 0; @@ -1166,7 +1179,7 @@ static int readhash(FILE *f) { - int i, space; + int i, space, newcol; wint_t t; int sum; @@ -1176,6 +1189,12 @@ for (i = 0; (t = getwc(f)) != L'\n'; i++) { if (t == L'\r' && strip_cr) continue; + if (t == L'\t' && Eflag) + newcol = ((i/8)+1)*8; + do { + sum = sum * 127 + (int) L' '; + } while (++i < newcol); + if (t == EOF) { if (i == 0) return (0); From owner-p4-projects@FreeBSD.ORG Wed Jun 23 03:11:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 339DB1065672; Wed, 23 Jun 2010 03:11:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEB42106564A for ; Wed, 23 Jun 2010 03:11:20 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB6E88FC0A for ; Wed, 23 Jun 2010 03:11:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5N3BK5r028222 for ; Wed, 23 Jun 2010 03:11:20 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5N3BKZg028220 for perforce@freebsd.org; Wed, 23 Jun 2010 03:11:20 GMT (envelope-from ligregni@FreeBSD.org) Date: Wed, 23 Jun 2010 03:11:20 GMT Message-Id: <201006230311.o5N3BKZg028220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 03:11:21 -0000 http://p4web.freebsd.org/@@180137?ac=10 Change 180137 by ligregni@ligPhenom on 2010/06/23 03:10:23 Some work on the master daemon we can now connect to master and send the path and MD5 checksum of a file to ask server if the trail is there Affected files ... .. //depot/projects/soc2010/disaudit/damasterd.c#2 edit .. //depot/projects/soc2010/disaudit/damasterd.h#2 edit .. //depot/projects/soc2010/disaudit/msocket_work.c#2 edit .. //depot/projects/soc2010/disaudit/msocket_work.h#2 edit .. //depot/projects/soc2010/disaudit/shipd.c#5 edit .. //depot/projects/soc2010/disaudit/shipd.h#5 edit .. //depot/projects/soc2010/disaudit/ssocket_work.c#3 edit .. //depot/projects/soc2010/disaudit/ssocket_work.h#3 edit Differences ... ==== //depot/projects/soc2010/disaudit/damasterd.c#2 (text+ko) ==== @@ -27,8 +27,8 @@ /*** INCLUDES ***/ -#include "shipd.h" -#include "ssocket_work.h" +#include "damasterd.h" +#include "msocket_work.h" #include #include #include @@ -41,11 +41,66 @@ /*** DECLARATIONS ***/ +/* Directory settings took from audit_control */ +char slave_trails_dir[MAX_DIR_SIZE + 1]; +char *ptr_std; +int slave_dirs; + +/* The level of trust the shipping process will have (0 means disabled) */ +int panic_level; + +/* Port number */ +int port_number; + /* The destination of the messages are controlled by this variable */ int debug; +/* Socket buffer management */ +char buffer[MAX_BUF_SIZE + 1]; +int brecv; + main(int argc, char *argv[]) { + char cl_opt; + int last = 0; + + debug = 0; + + while ((cl_opt = getopt(argc, argv, "dl")) != -1) + switch (cl_opt) + { + case 'd': + /* Debug option */ + debug = 1; + break; + } + + /* If not debugging, daemonize the program */ + if (debug == 0 && daemon(0,0) != 0) + { + perror("Can't daemonize, exiting!"); + exit(1); + } + + /* Set the directory path, the host address, the panic level */ + if (get_parameters() == -1) + { + to_log("Can't get the parameters to work!"); + exit(1); + } + + ptr_std = slave_trails_dir + strlen(slave_trails_dir); + + /* There is no shipd enabled and it wasn't called by AUDIT (normally the unique way to get 'last' on) */ + if (panic_level == 0) + { + to_log("DAMasterd disabled"); + exit(0); + } + + if (do_master_daemon() == -1) + exit(1); + return 0; } @@ -59,3 +114,150 @@ } +do_master_daemon() +{ + int socketfd, newsockfd, childpid; + char message[256]; + char client_host[256]; + struct sockaddr clientinfo; + + if ((socketfd = init_socket(port_number)) < 0) + { + sprintf(message, "Error initializing socket on port %d", port_number); + to_log(message); + return -1; + } + + while (1) + { + newsockfd = accept_connection(socketfd, &clientinfo); + + if (newsockfd < 0) + { + sprintf(message, "Error accepting client connections"); + to_log(message); + return -1; + } + + if ((childpid = fork()) < 0) + { + to_log("Error forking the process"); + return -1; + } + else if (childpid == 0) + { + debug = 0; + if (process_request(newsockfd, &clientinfo) == -1) + { + to_log("Error processing client's request"); + return -1; + } + close(socketfd); + } + + close(newsockfd); + } + + return 0; +} + +get_parameters() +{ + /* GSoC: using an special file, intended to include this values at audit_control */ + FILE *fpars = fopen("/etc/security/damasterd_control", "r"); + + char sslave_dirs[10]; + + if (!fpars) + return -1; + + if (feof(fpars)) + return -1; + + fscanf(fpars, "%s", slave_trails_dir); + fscanf(fpars, "%s", sslave_dirs); + fscanf(fpars, "%d", &panic_level); + fscanf(fpars, "%d", &port_number); + + if (strcmp(sslave_dirs, "no")) + slave_dirs = 1; + else + slave_dirs = 0; + + return 0; +} + +process_request(int sfd, struct sockaddr *clientinfo) +{ + int res = -1; + + char opt[1]; + + get_from_socket(sfd, opt); + + switch(opt[0]) + { + case '1': /* The request is about searching for a file */ + res = search_trail(sfd, clientinfo); + break; + case '2': /* The request is about receiving a trail */ + res = receive_trail(sfd, clientinfo); + break; + default: + to_log("Can't understand user's request!"); + } + + close(sfd); + + return res; +} + +search_trail(int sfd, struct sockaddr *clientinfo) +{ + char hbuf[NI_MAXHOST+1]; + char message[MAX_PATH_SIZE + 50]; + char hostname[NI_MAXHOST+1]; + char path[MAX_TRAILPATH_SIZE+1], md5slave[33]; + + get_from_socket(sfd, path); + get_from_socket(sfd, md5slave); + + strcpy(hostname, inet_ntoa(((struct sockaddr_in *) clientinfo)->sin_addr)); + + if (getnameinfo(clientinfo, clientinfo->sa_len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD)) + to_log("Couldn't resolve hostname, using IP address"); + else + strcpy(hostname, hbuf); + + sprintf(message, "Looking for \"%s\" from \"%s\" with MD5: \"%s\"", path, hostname, md5slave); + to_log(message); + + return 1; +} + +void +get_from_socket(int sfd, char *dest) +{ + int len, left; + char *ptr; + brecv = recv(sfd, buffer, sizeof(int), 0); + strncpy((char *) &len, buffer, sizeof(int)); + + left = len; + ptr = dest; + + while (left > 0) + { + brecv = recv(sfd, buffer, min(MAX_BUF_SIZE, left), 0); + buffer[brecv] = 0; + strcpy(ptr, buffer); + ptr += brecv; + left -= brecv; + } +} + +receive_trail(int sfd, struct sockaddr *clientinfo) +{ + return 0; +} + ==== //depot/projects/soc2010/disaudit/damasterd.h#2 (text+ko) ==== @@ -28,6 +28,25 @@ #ifndef _DAMASTERD_H_ #define _DAMASTERD_H_ +#define MAX_DIR_SIZE 255 +#define MAX_BUF_SIZE 1024 +#define MAX_PATH_SIZE MAX_DIR_SIZE + 50 +#define MAX_HOST_SIZE 255 +#define MAX_TRAILPATH_SIZE 29 + +#define min(a,b) (a < b ? a : b) + +#include +#include +#include +#include + void to_log(char *); +int get_parameters(); +int do_master_daemon(); +int process_request(int, struct sockaddr *); +int search_trail(int, struct sockaddr *); +int receive_trail(int, struct sockaddr *); +void get_from_socket(int, char *); #endif ==== //depot/projects/soc2010/disaudit/msocket_work.c#2 (text+ko) ==== @@ -35,69 +35,14 @@ #include #include -int -do_socket_check_file(char *host, int port, char *path, char *fullpath, char *md5) +init_socket(int port) { + struct sockaddr_in sockaddr; int sockfd; - if (init_socket(host, port, &sockfd) == -1) - return -1; - - return -1; -} - -int -is_ipv4(char *address) -{ - int points=0, last_point=0, i, len=strlen(address); - - /* Here we will check if the string is a valid IPv4 address */ - - for(i=0; i last_point+1) /* Counting the points and making sure there are no two consecutive points */ - { - last_point = i; - ++points; - } - else if (!isdigit(address[i])) - break; - - if (points == 3 && i == len) - return 1; - return 0; -} - -int -init_socket(char *host, int port, int *sfd) -{ - struct sockaddr_in sockaddr; - struct in_addr inaddr; - struct hostent *hostentry = NULL; - char message[256]; - int sockfd, res; - char ipv4[16]; - - if (!is_ipv4(host)) - { - hostentry = gethostbyname(host); - if (!hostentry) - { - to_log("Error gettig the host"); - return -1; - } - - sprintf(message, "Got for the host: %s the IPv4 address: %s", host, inet_ntoa(*((struct in_addr *)hostentry->h_addr))); - to_log(message); - } - sockfd = socket(PF_INET, SOCK_STREAM, 0); - if (sockfd == -1) + if (sockfd < 0) { to_log("Cannot create socket!"); return -1; @@ -106,21 +51,31 @@ bzero(&sockaddr, sizeof(sockaddr)); sockaddr.sin_family = AF_INET; - sockaddr.sin_addr.s_addr = hostentry != NULL ? ((struct in_addr *) hostentry->h_addr)->s_addr : inet_addr(host); + sockaddr.sin_addr.s_addr = htonl(INADDR_ANY); sockaddr.sin_port = htons(port); - res = connect(sockfd, (struct sockaddr *) &sockaddr, sizeof(sockaddr)); - - if (res < 0) + if (bind(sockfd, (struct sockaddr *) &sockaddr, sizeof(sockaddr)) < 0) { - to_log("Can't connect to server!"); + to_log("Cannot bind to port"); return -1; } - sprintf(message, "Successfully connected to: %s", hostentry != NULL ? inet_ntoa(*((struct in_addr *) hostentry->h_addr)) : host); - to_log(message); + listen(sockfd, 500); + + return sockfd; +} + +accept_connection(int sfd, struct sockaddr *clientinfo) +{ + struct sockaddr_in clientaddr; + int clientlen = sizeof(clientaddr); + int retval = 0; + + retval = accept(sfd, (struct sockaddr *) &clientaddr, &clientlen); + + if (retval >= 0) + clientinfo = (struct sockaddr *) &clientaddr; - *sfd = sockfd; - return 0; + return retval; } ==== //depot/projects/soc2010/disaudit/msocket_work.h#2 (text+ko) ==== @@ -28,7 +28,9 @@ #ifndef _SSOCKET_WORK_H_ #define _SSOCKET_WORK_H_ -int do_socket_check_file(char *, int, char *, char *, char *); -int init_socket(char *, int, int *); +#include + +int init_socket(int); +int accept_connection(int, struct sockaddr *); #endif ==== //depot/projects/soc2010/disaudit/shipd.c#5 (text+ko) ==== @@ -125,6 +125,8 @@ fscanf(fpars, "%d", &msec_freq); fscanf(fpars, "%d", &port_number); + fclose(fpars); + return 0; } @@ -168,7 +170,6 @@ * closed trail in meaning of lexicographic * order (that is also a chronological one) */ -int get_last_trail(char *path) { DIR *dp; @@ -227,7 +228,6 @@ * so we must ensure we will only deal with the ones * that are trails */ -int is_audit_trail(char *path) { /* @@ -261,7 +261,6 @@ } } -int send_trail(char *path) { return 0; @@ -272,7 +271,8 @@ * newest correct trail and sync from it to the last * closed trail */ -void do_daemon_date() +void +do_daemon_date() { DIR *dp; struct dirent *dirp; @@ -384,7 +384,7 @@ * that an audit trail is older than the other one * according their lexicographic value */ -int cmp_trails (const void *A, const void *B) +cmp_trails (const void *A, const void *B) { if (strcmp(*((char **)A), *((char **)B)) < 0) return 1; @@ -399,7 +399,7 @@ * checksums on both systems are not equal, then the function * will return "false" since an incomplete trail is not valid here. */ -int is_in_master(char *path, char *fullpath) +is_in_master(char *path, char *fullpath) { char *md5 = (char *) malloc (sizeof(char) * 33); char message[MAX_PATH_SIZE + 33]; @@ -412,7 +412,7 @@ to_log(message); /* Included in socket_work.c, this intended to implement SSL later */ - if (do_socket_check_file(master_host, port_number, path, fullpath, md5) == -1) + if (do_socket_check_file(master_host, port_number, path, md5) == -1) ret_val = 0; free(md5); @@ -425,7 +425,8 @@ * This function will make sure that ALL the trails * of the slave system are on master system */ -void do_daemon_all() +void +do_daemon_all() { DIR *dp; struct dirent *dirp; ==== //depot/projects/soc2010/disaudit/shipd.h#5 (text+ko) ==== ==== //depot/projects/soc2010/disaudit/ssocket_work.c#3 (text+ko) ==== @@ -34,19 +34,33 @@ #include #include #include +#include "ssocket_work.h" -int -do_socket_check_file(char *host, int port, char *path, char *fullpath, char *md5) +do_socket_check_file(char *host, int port, char *path, char *md5) { int sockfd; if (init_socket(host, port, &sockfd) == -1) return -1; + send_to_socket(sockfd, "1"); + send_to_socket(sockfd, path); + send_to_socket(sockfd, md5); + + close(sockfd); + return -1; } -int +void +send_to_socket(int sfd, char *data) +{ + int len = strlen(data); + + send(sfd, &len, sizeof(int), 0); + send(sfd, data, len, 0); +} + is_ipv4(char *address) { int points=0, last_point=0, i, len=strlen(address); @@ -72,7 +86,6 @@ return 0; } -int init_socket(char *host, int port, int *sfd) { struct sockaddr_in sockaddr; ==== //depot/projects/soc2010/disaudit/ssocket_work.h#3 (text+ko) ==== @@ -28,7 +28,8 @@ #ifndef _SSOCKET_WORK_H_ #define _SSOCKET_WORK_H_ -int do_socket_check_file(char *, int, char *, char *, char *); +int do_socket_check_file(char *, int, char *, char *); int init_socket(char *, int, int *); +void send_to_socket(int, char *); #endif From owner-p4-projects@FreeBSD.ORG Wed Jun 23 13:37:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 612211065670; Wed, 23 Jun 2010 13:37:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25416106564A for ; Wed, 23 Jun 2010 13:37:47 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 125B68FC1B for ; Wed, 23 Jun 2010 13:37:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5NDbk4e016688 for ; Wed, 23 Jun 2010 13:37:46 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5NDbkFp016685 for perforce@freebsd.org; Wed, 23 Jun 2010 13:37:46 GMT (envelope-from gpf@FreeBSD.org) Date: Wed, 23 Jun 2010 13:37:46 GMT Message-Id: <201006231337.o5NDbkFp016685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 13:37:47 -0000 http://p4web.freebsd.org/@@180147?ac=10 Change 180147 by gpf@gpf_desktop on 2010/06/23 13:36:55 I'm back in the game! experimental nfs server: - spent some time trying to figure out the best way to go about auditing paths in fs/nfsserver. I ended up taking advantage of the chokepoints that Rick's code provides us; this way I avoid passing extra arguments to the pseudosyscalls and messing his code. I'll keep working on that in the next few days. - fixed bogus behavior of my patch in setattr - also changed how nfs rpc numbers are mapped to audit events, this will prove useful when I introduce nfsv4 to audit - also figured out how and why vn_fullpath() kernel panics in my nfs patches. Turns out my current nfs patches are ok in regards to that matter, more on that in my weekly report; perhaps I'll also send an email to hackers@ although I doubt it'll get any attention, anyhoo Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.c#6 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 (text+ko) ==== @@ -241,9 +241,7 @@ nfsattrbit_t attrbits, retbits; nfsv4stateid_t stateid; NFSACL_T *aclp = NULL; - - if (vp != NULL) - AUDIT_ARG_VNODE1(vp); + if (nd->nd_repstat) { nfsrv_wcc(nd, preat_ret, &nva2, postat_ret, &nva); return (0); @@ -386,6 +384,7 @@ if (!nd->nd_repstat) nd->nd_repstat = postat_ret; } + AUDIT_ARG_VNODE1(vp); vput(vp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); @@ -398,6 +397,7 @@ nfsrv_fillattr(nd, &nva); return (0); nfsmout: + AUDIT_ARG_VNODE1(vp); vput(vp); #ifdef NFS4_ACL_EXTATTR_NAME acl_free(aclp); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 (text+ko) ==== @@ -345,6 +345,113 @@ NFSV4OP_COMMIT, }; +/* + * XXXgpf: should relocate them someplace else + * I just dont know where:S + */ +#define PARENTHINT 0x0001 +#define EXHAUSTSEARCH 0x0002 +#define WANTNAME 0x0004 + +/* + * XXXgpf: should probably relocate this function somewhere else as it's going to be called from various + * places in fs/nfsserver/ + * + * Do our best to acquire 'a' working path for vp + * + * vp - vnode in question + * dvp - directory with vp as a child + * fname - name used to reference vp inside dvp + * fhp - file handle for vp + * n - AUDIT_ARG_UPATH1 or AUDIT_ARG_UPATH2 + */ +static void +nfsrv_auditpath(struct vnode *vp, struct vnode *dvp, char *fname, fhandle_t *fhp, int n) +{ + char path[PATH_MAX]; + struct thread *td; + char *fullpath, *freepath; + char success; + + if (!AUDITING_TD(curthread)) + return; + + td = curthread; + freepath = NULL; + success = 0; + + /* try to find the path through vp */ + if (vp != NULL) { + /* try the cache */ + vn_fullpath_global(td, vp, &fullpath, &freepath); + if (freepath != NULL) { + success = 1; + goto out; + } + + /* if our cache fails us */ + if (fhp != NULL && vp->v_mount != NULL) { + uint64_t parent_hint; + /* get the hint stored inside the file handle */ + VFS_FHHINT(vp->v_mount, &fhp->fh_fid, &parent_hint); + vn_fullpath_nocache(vp, &fullpath, &freepath, + parent_hint, PARENTHINT | WANTNAME); + if (freepath != NULL) { + success = 1; + goto out; + } + } + } + + /* try to find the path through dvp and the component name used to reference vp */ + if (dvp != NULL && fname != NULL) { + /* try the cache */ + vn_fullpath_global(td, dvp, &fullpath, &freepath); + if (freepath != NULL) { + snprintf(path, sizeof(path), "%s/%s", fullpath, fname); + fullpath = path; + success = 1; + goto out; + } + + /* if our cache fails us */ + vn_fullpath_nocache(dvp, &fullpath, &freepath, + 0, WANTNAME); + if (freepath != NULL) { + snprintf(path, sizeof(path), "%s/%s", fullpath, fname); + fullpath = path; + success = 1; + goto out; + } + } + + /* last resort, just save the name used to reference the file in question */ + if (fname != NULL) { + strlcpy(path, fname, sizeof(path)); + fullpath = path; + success = 1; + } + +out: + if (success) { + switch (n) { + case 1: + AUDIT_ARG_UPATH1(td, fullpath); + break; + case 2: + AUDIT_ARG_UPATH2(td, fullpath); + break; + default: + AUDIT_ARG_UPATH1(td, fullpath); + break; + } + } + + if (freepath != NULL) { + free(freepath, M_TEMP); + } +} + /* * Do an RPC. Basically, get the file handles translated to vnode pointers * and then call the appropriate server routine. The server routines are @@ -442,13 +549,24 @@ if (vp) NFSVOPUNLOCK(vp, 0, p); error = (*(nfsrv3_procs1[nd->nd_procnum]))(nd, isdgram, - vp, NULL, (fhandle_t *)fh.nfsrvfh_data, p, &nes); + vp, NULL, (fhandle_t *)fh.nfsrvfh_data, p, &nes); } else if (nfs_retfh[nd->nd_procnum] == 2) { error = (*(nfsrv3_procs2[nd->nd_procnum]))(nd, isdgram, vp, NULL, p, &nes, NULL); } else { + if (vp != NULL) + vref(vp); error = (*(nfsrv3_procs0[nd->nd_procnum]))(nd, isdgram, vp, p, &nes); + if (vp != NULL) { + if (nd->nd_procnum != NFSPROC_CREATE && + nd->nd_procnum != NFSPROC_RMDIR && + nd->nd_procnum != NFSPROC_REMOVE) { + nfsrv_auditpath(vp, NULL, NULL, + (fhandle_t *)fh.nfsrvfh_data, 1); + } + vrele(vp); + } } AUDIT_NFS_EXIT(error, curthread); if (mp) { ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.c#6 (text) ==== @@ -598,128 +598,40 @@ int audit_nfs_proc_to_event(unsigned int proc, au_event_t *event) { - switch (proc) { - case 0: - /* nfsrv_null */ - *event = AUE_NFS_NULL; - break; - - case 1: - /* nfsrv_getattr */ - *event = AUE_NFS_GETATTR; - break; - - case 2: - /* nfsrv_setattr */ - *event = AUE_NFS_SETATTR; - break; - - case 3: - /* nfsrv_lookup */ - *event = AUE_NFS_LOOKUP; - break; - - case 4: - /* nfsrv3_access */ - *event = AUE_NFS_ACCESS; - break; - - case 5: - /* nfsrv_readlink */ - *event = AUE_NFS_READLINK; - break; - - case 6: - /* nfsrv_read */ - *event = AUE_NFS_READ; - break; - - case 7: - /* nfsrv_write */ - *event = AUE_NFS_WRITE; - break; - - case 8: - /* nfsrv_create */ - *event = AUE_NFS_CREATE; - break; - - case 9: - /* nfsrv_mkdir */ - *event = AUE_NFS_MKDIR; - break; - - case 10: - /* nfsrv_symlink */ - *event = AUE_NFS_SYMLINK; - break; - - case 11: - /* nfsrv_mknod */ - *event = AUE_NFS_MKNODE; - break; - - case 12: - /* nfsrv_remove */ - *event = AUE_NFS_REMOVE; - break; - - case 13: - /* nfsrv_rmdir */ - *event = AUE_NFS_RMDIR; - break; - - case 14: - /* nfsrv_rename */ - *event = AUE_NFS_RENAME; - break; - - case 15: - /* nfsrv_link */ - *event = AUE_NFS_LINK; - break; - - case 16: - /* nfsrv_readdir */ - *event = AUE_NFS_READDIR; - break; - - case 17: - /* nfsrv_readdirplus */ - *event = AUE_NFS_READDIR_PLUS; - break; - - case 18: - /* nfsrv_statfs */ - *event = AUE_NFS_STATFS; - break; - - case 19: - /* nfsrv_fsinfo */ - *event = AUE_NFS_FSINFO; - break; - - case 20: - /* nfsrv_pathconf */ - *event = AUE_NFS_PATHCONF; - break; - - case 21: - /* nfsrv_commit */ - *event = AUE_NFS_COMMIT; - break; - - case 22: - /* nfsrv_noop */ - *event = AUE_NFS_NOOP; - break; + au_event_t nfsv3toevent[] = { + AUE_NFS_NULL, + AUE_NFS_GETATTR, + AUE_NFS_SETATTR, + AUE_NFS_LOOKUP, + AUE_NFS_ACCESS, + AUE_NFS_READLINK, + AUE_NFS_READ, + AUE_NFS_WRITE, + AUE_NFS_CREATE, + AUE_NFS_MKDIR, + AUE_NFS_SYMLINK, + AUE_NFS_MKNODE, + AUE_NFS_REMOVE, + AUE_NFS_RMDIR, + AUE_NFS_RENAME, + AUE_NFS_LINK, + AUE_NFS_READDIR, + AUE_NFS_READDIR_PLUS, + AUE_NFS_STATFS, + AUE_NFS_FSINFO, + AUE_NFS_PATHCONF, + AUE_NFS_COMMIT, + AUE_NFS_NOOP, + }; + static int nfs_v3nprocs = sizeof(nfsv3toevent) / sizeof(au_event_t); - default: - *event = AUE_NFS_NULL; - return 1; /* unmatched */ + if (proc < nfs_v3nprocs) { + *event = nfsv3toevent[proc]; + return 0; + } + else { + return EINVAL; } - - return 0; /* matched */ } /* @@ -736,14 +648,19 @@ au_class_t class; au_event_t event; au_id_t auid; + int error; KASSERT(td->td_ar == NULL, ("audit_nfs_enter: td->td_ar != NULL")); KASSERT((td->td_pflags & TDP_AUDITREC) == 0, ("audit_nfs_enter: TDP_AUDITREC set")); + + error = audit_nfs_proc_to_event(proc, &event); + if (error) { + td->td_ar = NULL; + return; + } - /* XXXgpf: perhaps log a failure to match a rpc to an audit event? */ - audit_nfs_proc_to_event(proc, &event); - + /* XXXgpf: for debuging, nevermind */ printf("audit_nfs_enter: procedure = %d\n" "audit_nfs_enter: event = %d\n", proc, event); From owner-p4-projects@FreeBSD.ORG Wed Jun 23 16:18:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 152851065674; Wed, 23 Jun 2010 16:18:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAB041065670 for ; Wed, 23 Jun 2010 16:18:43 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B758B8FC17 for ; Wed, 23 Jun 2010 16:18:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5NGIh10031623 for ; Wed, 23 Jun 2010 16:18:43 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5NGIh7T031621 for perforce@freebsd.org; Wed, 23 Jun 2010 16:18:43 GMT (envelope-from afiveg@FreeBSD.org) Date: Wed, 23 Jun 2010 16:18:43 GMT Message-Id: <201006231618.o5NGIh7T031621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 16:18:44 -0000 http://p4web.freebsd.org/@@180153?ac=10 Change 180153 by afiveg@cottonmouth on 2010/06/23 16:17:44 Improving comments and adding new macros Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#2 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#10 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#8 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#9 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#7 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#13 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#13 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#2 (text+ko) ==== @@ -334,15 +334,19 @@ again1: - printf("user kern distance = %d\n", USER_TO_KERN_RING_DISTANCE(p->ring)); +#ifdef __RINGMAP_DEB + printf("[%s] user kern distance = %d\n", __func__, + SW_TAIL_TO_HEAD_DIST(p->ring)); +#endif if ( RING_IS_EMPTY(p->ring) ) { + /* Sleep and wait for new incoming packets */ ioctl(ringmap_cdev_fd, IOCTL_SLEEP_WAIT); goto again1; } if (cnt == -1) - cnt = USER_TO_KERN_RING_DISTANCE(p->ring); + cnt = SW_TAIL_TO_HEAD_DIST(p->ring); for (ws = cnt ; ( (ws) && (RING_NOT_EMPTY(p->ring)) ) ; ) { @@ -362,11 +366,12 @@ (*callback)(user, &pkthdr, datap); - INC_USER_POINTER(p->ring); + INC_TAIL(p->ring); --ws; + } - } + RINGMAP_FUNC_DEBUG(end); return (cnt - ws); } ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#10 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#8 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#9 (text+ko) ==== @@ -35,15 +35,25 @@ extern void lem_disable_intr(struct adapter *); +/* + * This function synchronize the tail and head hardware registers + * with head and tail software varibles, that are visible from + * software process. + * + * Synchronisation rules: + * 1. SYNC_HEAD: ring->kernrp = RDH + * 2. SYNC_TAIL: RDT = ring->userrp + */ void rm_8254_sync_head_tail(device_t dev, struct ring *ring) { struct adapter *adapter; adapter = (struct adapter *)device_get_softc(dev); - ring->kernrp = RINGMAP_HW_READ_HEAD(adapter); - RINGMAP_HW_SYNC_TAIL(adapter, ring); - adapter->rm->ring->hw_RDT = ring->userrp; + RINGMAP_HW_SYNC_HEAD(adapter, ring); /* SW_HEAD <== HW_HEAD */ + RINGMAP_HW_SYNC_TAIL(adapter, ring); /* SW_TAIL ==> HW_TAIL */ + + adapter->rm->ring->hw_RDT = RINGMAP_HW_READ_TAIL(adapter); } @@ -126,7 +136,10 @@ ring->kern_wait_user = 0; ring->user_wait_kern = 0; ring->interrupts_counter = 0; - RINGMAP_HW_WRITE_TAIL(adapter, SLOTS_NUMBER - 1); + + RINGMAP_HW_WRITE_TAIL(adapter, + (R_MODULO(RINGMAP_HW_READ_HEAD(adapter) - 1))); + ring->userrp = RINGMAP_HW_READ_TAIL(adapter); ring->size = SLOTS_NUMBER; ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#7 (text+ko) ==== @@ -25,6 +25,9 @@ #define RINGMAP_HW_READ_HEAD(adapter) \ RINGMAP_HW_READ_REG(&adapter->hw, E1000_RDH(0)) +#define RINGMAP_HW_SYNC_HEAD(adapter, ring) \ + SW_HEAD(ring) = RINGMAP_HW_READ_HEAD(adapter); + #define RINGMAP_HW_SYNC_TAIL(adapter, ring) \ RINGMAP_HW_WRITE_REG(&adapter->hw, E1000_RDT(0), ring->userrp) ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#13 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#13 (text+ko) ==== @@ -1,22 +1,32 @@ /* Minimum distance to be kept between the userrp and RDT to provide a * guarantee to userspace processes that the previous n buffer positions - * behind userrp will not be overwritten */ + * behind userrp will not be overwritten + * + * Currently not used!!! + * */ #define RING_SAFETY_MARGIN 3 -/* Max value for number of descriptors (a.k.a. slots in the ringbuffer) is 4096 */ +/* + * value for number of descriptors (a.k.a. slots in the ringbuffer) + */ #define SLOTS_NUMBER 16 -/* Prefix for name of device (for example /dev/ringmap_cdev_0 will full name) */ +/* + * Prefix for name of device (for example /dev/ringmap_cdev0 will full name) + */ #define RINGMAP_DEVICE "ringmap_cdev" /* Name of module to be loaded*/ #define MOD_NAME "if_ringmap.ko" -/* Messaure statistics for each pkt */ +/* + * Messaure statistics for each pkt. + * at the moment not used, but will be + */ #define EACH_PKT 20 /* - * Driver have to work only with device wich has the following device ID if 0 + * Driver works only with device wich has the following device ID. If 0 * then work with all devices that was found and accepted in the "probe" * function. * @@ -24,7 +34,7 @@ */ #define DEV_ID 0 -/* Enable/Disable Transiv */ +/* Enable/Disable Transiv. If 0, then the adapter will only receive pkts */ #define RINGMAP_TX_ENABLE 0 @@ -122,7 +132,7 @@ }; struct ringmap { - /* Device structure of network adapters */ + /* Device structure of network adapter */ device_t dev; /* Char device for communications between user and kernel spaces */ @@ -142,12 +152,61 @@ }; struct ringmap_functions { + +/* + * Set pointer to the ringmap structure into the adapters + * driver structure. + */ int (*set_ringmap_to_adapter)(device_t, struct ringmap*); + +/* + * In some situations it is safe to disable + * interrupts on adapter. + */ void (*enable_intr)(device_t); void (*disable_intr)(device_t); + +/* + * Initialize the ring slots with pointers to the + * mbufs, packets buffers and descriptors. + */ int (*init_slots)(struct ring *, device_t); + +/* + * This function should be calld from ISR. It should contain + * the very fast executable operations (don't sleep!). + */ void (*interrupt)(void *); + +/* + * This function should be calld from delayed interrupt + * function. It can contain operations that must not be + * very fast. + */ void (*delayed_interrupt)(void *); + + + +/* + * This function synchronize the tail and head hardware registers + * with head and tail software varibles, that are visible from + * software process. + * + * Synchronisation rules: + * 1. SYNC_HEAD: HARDWARE_HEAD => SOFTWARE_HEAD + * set value from hardware HEAD register into the software visible + * HEAD-variable: ring->kernrp. The User-space process shouldn't touch + * the ring->kernrp variable. Only hardware increment the value in the + * HEAD register onto adapters chip while receiving new packets, and only + * driver (kernel) synchronize then hardware HEAD with ring->kernrp. + * + * 2. SYNC_TAIL: SOFTWARE_TAIL => HARDWARE_TAIL + * set value from software TAIL-variable: ring->userrp into the hardware + * TAIL-register. Hardware shouldn't change the content of TAIL-register. + * Software after reading one packet in RAM increment the value of + * ring->userrp. Kernel will check this value and set it into the + * hardware TAIL-register. + */ void (*sync_head_tail)(device_t, struct ring *); }; @@ -181,72 +240,57 @@ * Arithmetic in Ring Buffer **********************************************/ -#define R_MODULO(a,b) \ +/* Software HEAD and TAIL ring pointers */ +#define SW_TAIL(ringp) ((ringp)->userrp) +#define SW_HEAD(ringp) ((ringp)->kernrp) + +/* + * The hardware HEAD and TAIL are defined in the hardware dependent + * header files + */ + +#define RING_MODULO(a,b) \ ( ((unsigned int)(a)) % ((unsigned int)(b)) ) /* Distance from "a" to "b" in ring: r = (b-a) mod (size) */ -#define RING_DISTANCE(r,a,b,size) \ - (r) = R_MODULO(((b) - (a)), (size)); +#define RING_DISTANCE(a,b,size) \ + (RING_MODULO((b)-(a), (size))) -#define R_DISTANCE(a,b,size) \ - (R_MODULO((b)-(a), (size))) +#define R_MODULO(a) \ + RING_MODULO((a), (SLOTS_NUMBER)) -/* Distance from KERN pointer to USER pointer */ -#define KERN_TO_USER_DIST(r, ringp) \ - do { \ - RING_DISTANCE((r), (ringp)->kernrp, (ringp)->userrp, SLOTS_NUMBER); \ - if ((r) == 0) (r) = SLOTS_NUMBER; \ - } while (0); +#define R_DISTANCE(a, b) \ + RING_DISTANCE((a), (b), (SLOTS_NUMBER)) -/* Distance from USER pointer to KERN pointer */ -#define USER_TO_KERN_DIST(r, ringp) \ - do { \ - RING_DISTANCE((r), (ringp)->userrp, (ringp)->kernrp, SLOTS_NUMBER); \ - } while(0); +/* Distance from head to tail in ring */ +#define SW_HEAD_TO_TAIL_DIST(ringp) \ + R_DISTANCE(SW_HEAD(ringp), SW_TAIL(ringp)) -/* Distance from KERN to USER pointer */ -#define KERN_TO_USER_RING_DISTANCE(ringp) \ - (((ringp)->userrp == (ringp)->kernrp) ? 0 : R_DISTANCE((ringp)->kernrp, (ringp)->userrp, SLOTS_NUMBER)) +/* Distance from tail to head in ring */ +#define SW_TAIL_TO_HEAD_DIST(ringp) \ + ((SW_TAIL(ringp) == SW_HEAD(ringp)) ? SLOTS_NUMBER : \ + R_DISTANCE(SW_TAIL(ringp), SW_HEAD(ringp))) -/* Distance from USER to KERN pointer */ -#define USER_TO_KERN_RING_DISTANCE(ringp) \ - (((ringp)->userrp == (ringp)->kernrp) ? SLOTS_NUMBER : R_DISTANCE((ringp)->userrp, (ringp)->kernrp, SLOTS_NUMBER)) +#define INC_TAIL(ringp) \ + (SW_TAIL(ringp)) = R_MODULO(SW_TAIL(ringp) + 1); -#define RING_IS_EMPTY(ringp) \ - ((USER_TO_KERN_RING_DISTANCE(ringp)) == 1) +#define RING_IS_EMPTY(ringp) \ + ((SW_TAIL_TO_HEAD_DIST(ringp)) == 1) -#define RING_NOT_EMPTY(ringp) \ - ((USER_TO_KERN_RING_DISTANCE(ringp)) > 1) +#define RING_NOT_EMPTY(ringp) \ + ((SW_TAIL_TO_HEAD_DIST(ringp)) != 1) -#define RING_IS_FULL(ringp) \ - ((KERN_TO_USER_RING_DISTANCE(ringp)) == 0) +#define RING_IS_FULL(ringp) \ + ((SW_HEAD_TO_TAIL_DIST(ringp)) == 0) -/* Increment of USER pointer. (KERN pointer is incremented by Hardware) */ -#define INC_USER_POINTER(ringp) \ - ((ringp)->userrp) = R_MODULO(((ringp)->userrp + 1), SLOTS_NUMBER); +#define RING_SLOT(ringp, i) \ + ((ringp)->slot[(i)]) -/* Add "a" to USER pointer */ -#define ADD_USER_POINTER(ringp, a) \ - ((ringp)->userrp) = R_MODULO(((ringp)->userrp + a), SLOTS_NUMBER); +#define TAIL_SLOT(ringp) \ + RING_SLOT((ringp), (SW_TAIL((ringp)))) -/* Next Operationts are only in Kern usefull because they set hardware registers */ -#ifdef _KERNEL - -/* Read value from RDH, set RDT = RDH - RING_SAFETY_MARGIN */ -/* -#define RINGMAP_INIT(ringp, adapter) \ - do{ \ - (ringp)->kern_wait_user = 0; \ - (ringp)->user_wait_kern = 0; \ - (ringp)->interrupts_counter = 0; \ - (ringp)->size = SLOTS_NUMBER; \ - (ringp)->kernrp = RINGMAP_HW_READ_REG(&(adapter)->hw, E1000_RDH(0)); \ - (ringp)->userrp = (ringp)->kernrp; \ - RINGMAP_HW_WRITE_REG(&(adapter)->hw, E1000_RDT(0), R_MODULO(((ringp)->userrp) - RING_SAFETY_MARGIN, SLOTS_NUMBER)); \ - }while(0); -*/ -#endif - +#define TAIL_PACKET(ringp) \ + TAIL_SLOT(ringp).packet /* * DEBUG OUTPUT From owner-p4-projects@FreeBSD.ORG Wed Jun 23 20:01:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39BFD10656EB; Wed, 23 Jun 2010 20:01:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D450C10656DC for ; Wed, 23 Jun 2010 20:01:48 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A69D88FC1D for ; Wed, 23 Jun 2010 20:01:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5NK1mHD063397 for ; Wed, 23 Jun 2010 20:01:48 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5NK1moY063395 for perforce@freebsd.org; Wed, 23 Jun 2010 20:01:48 GMT (envelope-from raj@freebsd.org) Date: Wed, 23 Jun 2010 20:01:48 GMT Message-Id: <201006232001.o5NK1moY063395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 20:01:49 -0000 http://p4web.freebsd.org/@@180162?ac=10 Change 180162 by raj@raj_nand on 2010/06/23 20:01:21 Unlock properly in a failing case. Submitted by: Yohanes Nugroho Affected files ... .. //depot/projects/nand2/sys/dev/nand/nand_cdev.c#2 edit Differences ... ==== //depot/projects/nand2/sys/dev/nand/nand_cdev.c#2 (text+ko) ==== @@ -210,6 +210,7 @@ if (off != 0 || (len % cg->page_size) != 0) { printf("Not aligned write start [0x%08x] size [0x%08x]\n", off, len); + nandbus_lock(nandbus); return (EINVAL); } From owner-p4-projects@FreeBSD.ORG Wed Jun 23 20:04:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86E191065676; Wed, 23 Jun 2010 20:04:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B7201065673 for ; Wed, 23 Jun 2010 20:04:52 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1FADA8FC15 for ; Wed, 23 Jun 2010 20:04:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5NK4qp4064659 for ; Wed, 23 Jun 2010 20:04:52 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5NK4peb064657 for perforce@freebsd.org; Wed, 23 Jun 2010 20:04:51 GMT (envelope-from raj@freebsd.org) Date: Wed, 23 Jun 2010 20:04:51 GMT Message-Id: <201006232004.o5NK4peb064657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 20:04:52 -0000 http://p4web.freebsd.org/@@180163?ac=10 Change 180163 by raj@raj_nand on 2010/06/23 20:04:27 Now, really unlock.. Affected files ... .. //depot/projects/nand2/sys/dev/nand/nand_cdev.c#3 edit Differences ... ==== //depot/projects/nand2/sys/dev/nand/nand_cdev.c#3 (text+ko) ==== @@ -210,7 +210,7 @@ if (off != 0 || (len % cg->page_size) != 0) { printf("Not aligned write start [0x%08x] size [0x%08x]\n", off, len); - nandbus_lock(nandbus); + nandbus_unlock(nandbus); return (EINVAL); } From owner-p4-projects@FreeBSD.ORG Wed Jun 23 20:20:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 656D11065672; Wed, 23 Jun 2010 20:20:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29872106564A; Wed, 23 Jun 2010 20:20:48 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id F04A18FC14; Wed, 23 Jun 2010 20:20:47 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 911AD46B2C; Wed, 23 Jun 2010 16:20:47 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id AA6938A03C; Wed, 23 Jun 2010 16:20:46 -0400 (EDT) From: John Baldwin To: Alexandre Fiveg Date: Wed, 23 Jun 2010 13:19:49 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201006171446.o5HEkRSP022515@repoman.freebsd.org> In-Reply-To: <201006171446.o5HEkRSP022515@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201006231319.49258.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Wed, 23 Jun 2010 16:20:46 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00, DATE_IN_PAST_03_06 autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 179713 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 20:20:48 -0000 On Thursday 17 June 2010 10:46:27 am Alexandre Fiveg wrote: > http://p4web.freebsd.org/@@179713?ac=10 > > Change 179713 by afiveg@cottonmouth on 2010/06/17 14:46:03 > > Begin with new design for ringmap: > 1. The new structure with pointers to hardware dependent functions: > "struct ringmap_functions" (/net/ringmap.h) > 2. Pointer to this structure placed in ringmap structure. > 3. In the ringmap_attach function look for pci Id of network controller, > and then, depending on controllers type, initialize the functions pointers: > (ringmap.c: set_ringmap_funcs()) I think 3) is the wrong way to go about it. Can't you have the NIC driver attach a ringmap and supply the function pointers to the NIC-specific functionality instead? You really don't want to have two separate lists of device IDs. The ringmap list will invariably become stale. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Wed Jun 23 21:10:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F4941065670; Wed, 23 Jun 2010 21:10:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A977106566B for ; Wed, 23 Jun 2010 21:10:04 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 207508FC1E for ; Wed, 23 Jun 2010 21:10:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5NLA4oh081521 for ; Wed, 23 Jun 2010 21:10:04 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5NLA37L081517 for perforce@freebsd.org; Wed, 23 Jun 2010 21:10:03 GMT (envelope-from raj@freebsd.org) Date: Wed, 23 Jun 2010 21:10:03 GMT Message-Id: <201006232110.o5NLA37L081517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2010 21:10:04 -0000 http://p4web.freebsd.org/@@180167?ac=10 Change 180167 by raj@raj_nand on 2010/06/23 21:09:41 IFC @180164 Affected files ... .. //depot/projects/nand2/Makefile.inc1#4 integrate .. //depot/projects/nand2/bin/pkill/pkill.1#2 integrate .. //depot/projects/nand2/bin/pkill/pkill.c#2 integrate .. //depot/projects/nand2/bin/sh/parser.c#4 integrate .. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 integrate .. //depot/projects/nand2/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/nand2/etc/login.conf#2 integrate .. //depot/projects/nand2/etc/namedb/named.root#2 integrate .. //depot/projects/nand2/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/nand2/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/nand2/lib/Makefile#4 integrate .. //depot/projects/nand2/lib/csu/i386-elf/crt1_s.S#2 integrate .. //depot/projects/nand2/lib/libc/nls/ru_RU.KOI8-R.msg#2 integrate .. //depot/projects/nand2/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/nand2/libexec/rtld-elf/mips/rtld_start.S#2 integrate .. //depot/projects/nand2/release/scripts/ports-install.sh#2 integrate .. //depot/projects/nand2/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/nand2/sbin/fsck_ffs/suj.c#2 integrate .. //depot/projects/nand2/sbin/fsck_msdosfs/Makefile#2 integrate .. //depot/projects/nand2/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/nand2/sbin/fsck_msdosfs/check.c#2 integrate .. //depot/projects/nand2/sbin/fsck_msdosfs/dir.c#2 integrate .. //depot/projects/nand2/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/nand2/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/nand2/sbin/geom/class/sched/gsched.8#2 integrate .. //depot/projects/nand2/sbin/geom/core/geom.c#2 integrate .. //depot/projects/nand2/sbin/geom/core/geom.h#2 integrate .. //depot/projects/nand2/sbin/geom/misc/subr.c#3 integrate .. //depot/projects/nand2/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/nand2/sbin/ping/ping.c#2 integrate .. //depot/projects/nand2/sbin/ping6/ping6.c#3 integrate .. //depot/projects/nand2/share/examples/perfmon/perfmon.c#2 integrate .. //depot/projects/nand2/share/man/man7/Makefile#2 integrate .. //depot/projects/nand2/share/man/man7/c99.7#1 branch .. //depot/projects/nand2/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/nand2/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/nand2/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/nand2/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/nand2/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/nand2/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/nand2/sys/amd64/include/smp.h#2 integrate .. //depot/projects/nand2/sys/arm/include/bootinfo.h#3 branch .. //depot/projects/nand2/sys/arm/mv/discovery/db78xxx.c#3 delete .. //depot/projects/nand2/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/nand2/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/nand2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/nand2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/nand2/sys/compat/x86bios/x86bios.c#4 integrate .. //depot/projects/nand2/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/nand2/sys/conf/NOTES#4 integrate .. //depot/projects/nand2/sys/conf/files#6 integrate .. //depot/projects/nand2/sys/conf/files.amd64#4 integrate .. //depot/projects/nand2/sys/conf/files.i386#3 integrate .. //depot/projects/nand2/sys/conf/files.mips#3 integrate .. //depot/projects/nand2/sys/conf/options.amd64#3 integrate .. //depot/projects/nand2/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/nand2/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/nand2/sys/dev/acpica/acpi_hpet.h#2 integrate .. //depot/projects/nand2/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/nand2/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/nand2/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/nand2/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/nand2/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/nand2/sys/dev/e1000/if_igb.h#4 integrate .. //depot/projects/nand2/sys/dev/e1000/if_lem.c#3 integrate .. //depot/projects/nand2/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/nand2/sys/dev/fb/vesa.c#4 integrate .. //depot/projects/nand2/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/nand2/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/nand2/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/nand2/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/nand2/sys/dev/ofw/ofw_bus_subr.h#3 integrate .. //depot/projects/nand2/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/nand2/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/nand2/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/nand2/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/nand2/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/nand2/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/nand2/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/nand2/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/nand2/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/nand2/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/nand2/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/nand2/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/nand2/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/nand2/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/nand2/sys/i386/conf/NOTES#3 integrate .. //depot/projects/nand2/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/nand2/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/nand2/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/nand2/sys/i386/i386/support.s#2 integrate .. //depot/projects/nand2/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/nand2/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/nand2/sys/i386/include/md_var.h#3 integrate .. //depot/projects/nand2/sys/i386/include/npx.h#3 integrate .. //depot/projects/nand2/sys/i386/include/pcb.h#3 integrate .. //depot/projects/nand2/sys/i386/isa/npx.c#3 integrate .. //depot/projects/nand2/sys/isa/rtc.h#2 integrate .. //depot/projects/nand2/sys/kern/kern_acct.c#2 integrate .. //depot/projects/nand2/sys/kern/kern_clock.c#3 integrate .. //depot/projects/nand2/sys/kern/kern_conf.c#3 integrate .. //depot/projects/nand2/sys/kern/kern_et.c#1 branch .. //depot/projects/nand2/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/nand2/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/nand2/sys/kern/kern_module.c#3 integrate .. //depot/projects/nand2/sys/kern/kern_resource.c#3 integrate .. //depot/projects/nand2/sys/kern/kern_sdt.c#2 integrate .. //depot/projects/nand2/sys/kern/kern_sig.c#3 integrate .. //depot/projects/nand2/sys/kern/kern_tc.c#3 integrate .. //depot/projects/nand2/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/nand2/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/nand2/sys/kern/subr_bus.c#3 integrate .. //depot/projects/nand2/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/nand2/sys/kern/subr_fattime.c#2 integrate .. //depot/projects/nand2/sys/kern/subr_lock.c#3 integrate .. //depot/projects/nand2/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/nand2/sys/kern/subr_module.c#2 integrate .. //depot/projects/nand2/sys/kern/subr_trap.c#3 integrate .. //depot/projects/nand2/sys/kern/subr_unit.c#2 integrate .. //depot/projects/nand2/sys/kern/subr_witness.c#3 integrate .. //depot/projects/nand2/sys/kern/sys_process.c#4 integrate .. //depot/projects/nand2/sys/kern/systrace_args.c#2 integrate .. //depot/projects/nand2/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/nand2/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/nand2/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/nand2/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/nand2/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/nand2/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/nand2/sys/mips/atheros/ar71xx_wdog.c#2 integrate .. //depot/projects/nand2/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/nand2/sys/mips/include/cpu.h#3 integrate .. //depot/projects/nand2/sys/mips/include/pmap.h#4 integrate .. //depot/projects/nand2/sys/mips/include/pte.h#3 integrate .. //depot/projects/nand2/sys/mips/include/tlb.h#1 branch .. //depot/projects/nand2/sys/mips/include/vm.h#2 integrate .. //depot/projects/nand2/sys/mips/mips/cpu.c#3 integrate .. //depot/projects/nand2/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/nand2/sys/mips/mips/mp_machdep.c#4 integrate .. //depot/projects/nand2/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/nand2/sys/mips/mips/tlb.c#1 branch .. //depot/projects/nand2/sys/mips/mips/trap.c#4 integrate .. //depot/projects/nand2/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/nand2/sys/mips/rmi/board.c#2 integrate .. //depot/projects/nand2/sys/mips/rmi/board.h#2 integrate .. //depot/projects/nand2/sys/mips/rmi/dev/xlr/rge.c#3 integrate .. //depot/projects/nand2/sys/modules/mqueue/Makefile#2 integrate .. //depot/projects/nand2/sys/netinet/sctp.h#2 integrate .. //depot/projects/nand2/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/nand2/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/nand2/sys/netinet/sctputil.c#4 integrate .. //depot/projects/nand2/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/nand2/sys/pc98/include/npx.h#2 integrate .. //depot/projects/nand2/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/nand2/sys/powerpc/aim/interrupt.c#3 integrate .. //depot/projects/nand2/sys/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/nand2/sys/powerpc/aim/nexus.c#3 integrate .. //depot/projects/nand2/sys/powerpc/booke/interrupt.c#3 integrate .. //depot/projects/nand2/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/nand2/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/nand2/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/nand2/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/nand2/sys/powerpc/mpc85xx/isa.c#2 integrate .. //depot/projects/nand2/sys/powerpc/mpc85xx/ocpbus.c#3 integrate .. //depot/projects/nand2/sys/powerpc/mpc85xx/ocpbus.h#3 integrate .. //depot/projects/nand2/sys/powerpc/mpc85xx/opic.c#2 integrate .. //depot/projects/nand2/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate .. //depot/projects/nand2/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/nand2/sys/powerpc/ofw/ofw_pcibus.c#3 integrate .. //depot/projects/nand2/sys/powerpc/powermac/cpcht.c#3 integrate .. //depot/projects/nand2/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/nand2/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/nand2/sys/powerpc/powermac/kiic.c#3 integrate .. //depot/projects/nand2/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/nand2/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/nand2/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/nand2/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/nand2/sys/powerpc/powermac/uninorthpci.c#2 integrate .. //depot/projects/nand2/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/nand2/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/nand2/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/nand2/sys/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/nand2/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/nand2/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/nand2/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/nand2/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/nand2/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/nand2/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/nand2/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/nand2/sys/sys/conf.h#3 integrate .. //depot/projects/nand2/sys/sys/pcpu.h#4 integrate .. //depot/projects/nand2/sys/sys/systm.h#3 integrate .. //depot/projects/nand2/sys/sys/timeet.h#1 branch .. //depot/projects/nand2/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/nand2/sys/vm/vm_page.c#4 integrate .. //depot/projects/nand2/sys/vm/vm_page.h#3 integrate .. //depot/projects/nand2/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/nand2/sys/x86/cpufreq/est.c#2 integrate .. //depot/projects/nand2/sys/x86/isa/atrtc.c#2 integrate .. //depot/projects/nand2/sys/x86/isa/clock.c#3 integrate .. //depot/projects/nand2/sys/x86/x86/local_apic.c#2 integrate .. //depot/projects/nand2/sys/x86/x86/timeevents.c#1 branch .. //depot/projects/nand2/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/nand2/tools/tools/netrate/tcpp/README#3 integrate .. //depot/projects/nand2/tools/tools/netrate/tcpp/parallelism.csh#1 branch .. //depot/projects/nand2/tools/tools/netrate/tcpp/runit.pl#1 branch .. //depot/projects/nand2/tools/tools/tinybsd/conf/default/TINYBSD#2 integrate .. //depot/projects/nand2/tools/tools/tinybsd/conf/vpn/TINYBSD#2 integrate .. //depot/projects/nand2/usr.bin/c99/c99.1#3 integrate .. //depot/projects/nand2/usr.bin/du/du.1#2 integrate .. //depot/projects/nand2/usr.bin/du/du.c#2 integrate .. //depot/projects/nand2/usr.bin/systat/vmstat.c#2 integrate .. //depot/projects/nand2/usr.bin/ypwhich/ypwhich.c#2 integrate .. //depot/projects/nand2/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/nand2/usr.sbin/cpucontrol/amd.c#2 integrate .. //depot/projects/nand2/usr.sbin/cpucontrol/intel.c#2 integrate .. //depot/projects/nand2/usr.sbin/mptutil/mptutil.8#3 integrate .. //depot/projects/nand2/usr.sbin/powerd/powerd.c#2 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/Makefile#3 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/disks.c#4 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/label.c#2 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/misc.c#2 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/nand2/usr.sbin/sysinstall/sysinstall.h#3 integrate .. //depot/projects/nand2/usr.sbin/timed/timed/measure.c#2 integrate Differences ... ==== //depot/projects/nand2/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.652 2010/06/13 13:02:43 raj Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.653 2010/06/16 16:52:35 raj Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1458,8 +1458,8 @@ DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/ .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE) -FDT_DTS_FILE!= grep "^makeoptions[[:space:]]\+FDT_DTS_FILE" \ - ${KERNCONFDIR}/${KERNCONF} 2> /dev/null | cut -d= -f2 +FDT_DTS_FILE!= awk '/^makeoptions[[:space:]]+FDT_DTS_FILE/ {FS="=|[ \t]+"; print $$3}' \ + ${KERNCONFDIR}/${KERNCONF} .endif .endif ==== //depot/projects/nand2/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.6 2010/03/02 07:20:46 joel Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.7 2010/06/20 08:48:30 brian Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -156,14 +156,16 @@ matches processes not in jail. .It Fl l Long output. -Print the process name in addition to the process ID for each matching +For +.Nm pgrep , +print the process name in addition to the process ID for each matching process. If used in conjunction with .Fl f , print the process ID and the full argument list for each matching process. -This option can only be used with the -.Nm pgrep -command. +For +.Nm pkill , +display the kill command used for each process killed. .It Fl n Select only the newest (most recently started) of the matching processes. .It Fl o ==== //depot/projects/nand2/bin/pkill/pkill.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.10 2010/03/02 07:20:46 joel Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.11 2010/06/20 08:48:30 brian Exp $"); #include #include @@ -128,7 +128,7 @@ { char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q, *pidfile; const char *execf, *coref; - int ancestors, debug_opt; + int ancestors, debug_opt, did_action; int i, ch, bestidx, rv, criteria, pidfromfile, pidfilelock; size_t jsz; int (*action)(const struct kinfo_proc *); @@ -242,8 +242,6 @@ criteria = 1; break; case 'l': - if (!pgrep) - usage(); longfmt = 1; break; case 'n': @@ -530,16 +528,24 @@ /* * Take the appropriate action for each matched process, if any. */ + did_action = 0; for (i = 0, rv = 0, kp = plist; i < nproc; i++, kp++) { if (PSKIP(kp)) continue; if (selected[i]) { + if (longfmt && !pgrep) { + did_action = 1; + printf("kill -%d %d\n", signum, kp->ki_pid); + } if (inverse) continue; } else if (!inverse) continue; rv |= (*action)(kp); } + if (!did_action && !pgrep && longfmt) + fprintf(stderr, + "No matching processes belonging to you were found\n"); exit(rv ? STATUS_MATCH : STATUS_NOMATCH); } @@ -552,7 +558,7 @@ if (pgrep) ustr = "[-LSfilnoqvx] [-d delim]"; else - ustr = "[-signal] [-ILfinovx]"; + ustr = "[-signal] [-ILfilnovx]"; fprintf(stderr, "usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n" ==== //depot/projects/nand2/bin/sh/parser.c#4 (text+ko) ==== @@ -36,10 +36,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.81 2010/06/19 10:33:04 jilles Exp $"); #include #include +#include #include "shell.h" #include "parser.h" ==== //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 (text+ko) ==== @@ -45,7 +45,7 @@ #undef input #undef unput #else -/* +/* * Define YY_INPUT for flex since input() can't be re-defined. */ #define YY_INPUT(buf,result,max_size) \ @@ -60,6 +60,19 @@ buf[n] = *yypcb->pcb_strptr++; \ result = n; \ } +/* + * Do not EOF let tokens to be put back. This does not work with flex. + * On the other hand, leaving current buffer in same state it was when + * last EOF was received guarantees that input() will keep returning EOF + * for all subsequent invocations, which is the effect desired. + */ +#undef unput +#define unput(c) \ + do { \ + int _c = c; \ + if (_c != EOF) \ + yyunput(_c, yytext_ptr); \ + } while(0) #endif static int id_or_type(const char *); @@ -811,8 +824,7 @@ longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); } - if (c0 != EOF) - unput(c0); + unput(c0); return (ttok); } ==== //depot/projects/nand2/contrib/binutils/binutils/doc/readelf.1#2 (text+ko) ==== @@ -247,14 +247,6 @@ .PD Displays the contents of the file's unwind section, if it has one. Only the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. -.IP "\fB\-u\fR" 4 -.IX Item "-u" -.PD 0 -.IP "\fB\-\-unwind\fR" 4 -.IX Item "--unwind" -.PD -Displays the contents of the file's unwind section, if it has one. Only -the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. .IP "\fB\-d\fR" 4 .IX Item "-d" .PD 0 ==== //depot/projects/nand2/etc/login.conf#2 (text+ko) ==== @@ -7,7 +7,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $FreeBSD: src/etc/login.conf,v 1.53 2009/06/23 20:57:27 kib Exp $ +# $FreeBSD: src/etc/login.conf,v 1.54 2010/06/19 09:21:34 brian Exp $ # # Default settings effectively disable resource limits, see the @@ -228,7 +228,7 @@ # # ## -## The dialer class should be used for a dialup PPP/SLIP accounts +## The dialer class should be used for a dialup PPP account ## Welcome messages/news suppressed ## #dialer:\ @@ -247,7 +247,7 @@ # # ## -## Site full-time 24/7 PPP/SLIP connections +## Site full-time 24/7 PPP connection ## - no time accounting, restricted to access via dialin lines ## #site:\ @@ -306,11 +306,6 @@ # :tc=subscriber: # # -#subslip|SLIP Subscriber Accounts:\ -# :tc=dialer:\ -# :tc=subscriber: -# -# #subshell|Shell Subscriber Accounts:\ # :tc=subscriber: # ==== //depot/projects/nand2/etc/namedb/named.root#2 (text+ko) ==== @@ -1,5 +1,5 @@ ; -; $FreeBSD: src/etc/namedb/named.root,v 1.15 2009/12/11 01:06:04 dougb Exp $ +; $FreeBSD: src/etc/namedb/named.root,v 1.16 2010/06/18 08:11:52 dougb Exp $ ; ; This file holds the information on root name servers needed to @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Dec 12, 2008 -; related version of root zone: 2008121200 +; last update: Jun 17, 2010 +; related version of root zone: 2010061700 ; ; formerly NS.INTERNIC.NET ; @@ -63,6 +63,7 @@ ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 ; ; OPERATED BY VERISIGN, INC. ; ==== //depot/projects/nand2/etc/periodic/daily/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.17 2008/09/21 22:02:26 sam Exp $ +# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.18 2010/06/17 12:25:47 netchild Exp $ .include @@ -8,7 +8,6 @@ 200.backup-passwd \ 330.news \ 400.status-disks \ - 404.status-zfs \ 405.status-ata-raid \ 406.status-gmirror \ 407.status-graid3 \ @@ -53,4 +52,9 @@ 500.queuerun .endif +.if ${MK_ZFS} != "no" +FILES+= 404.status-zfs \ + 800.scrub-zfs +.endif + .include ==== //depot/projects/nand2/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.32 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.33 2010/06/18 11:09:51 kib Exp $ .include MK_SSP= no @@ -17,7 +17,8 @@ CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 CFLAGS+= -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-zero-initialized-in-bss \ - -fno-zero-initialized-in-bss -fno-toplevel-reorder + -fno-zero-initialized-in-bss -fno-toplevel-reorder \ + -fno-asynchronous-unwind-tables -fno-omit-frame-pointer CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} ==== //depot/projects/nand2/lib/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.248 2010/06/09 19:57:20 rdivacky Exp $ +# $FreeBSD: src/lib/Makefile,v 1.249 2010/06/21 19:44:29 ed Exp $ .include @@ -138,7 +138,7 @@ _libbsnmp= libbsnmp .endif -.if ${MK_CLANG} != "no" +.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) _clang= clang .endif ==== //depot/projects/nand2/lib/csu/i386-elf/crt1_s.S#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $ + * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $ */ @@ -30,15 +30,22 @@ .align 4 .globl _start .type _start, @function -_start: xorl %ebp,%ebp +_start: + .cfi_startproc + xorl %ebp,%ebp pushl %ebp + .cfi_def_cfa_offset 4 movl %esp,%ebp + .cfi_offset %ebp,-8 + .cfi_def_cfa_register %ebp andl $0xfffffff0,%esp # align stack leal 8(%ebp),%eax pushl %eax # argv pushl 4(%ebp) # argc pushl %edx # rtld cleanup call _start1 + int3 + .cfi_endproc .size _start, . - _start - .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $" + .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $" ==== //depot/projects/nand2/lib/libc/nls/ru_RU.KOI8-R.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.2 2009/03/21 10:10:33 maxim Exp $ +$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.3 2010/06/20 06:52:10 maxim Exp $ $ $ Message catalog for ru_RU.KOI8-R locale $ @@ -183,6 +183,16 @@ 87 Атрибут не найден $ EDOOFUS 88 Ошибка программирования +$ EBADMSG +89 Плохой формат сообщения +$ EMULTIHOP +90 Попытка мультихопа +$ ENOLINK +91 Канал разорван +$ EPROTO +92 Ошибка протокола +$ ENOTCAPABLE +93 Недостаточно возможностей $ $ strsignal() support catalog $ ==== //depot/projects/nand2/lib/libkvm/kvm_proc.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.102 2009/12/10 21:16:16 brooks Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.103 2010/06/18 01:17:16 sbruno Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -323,7 +323,12 @@ (void)kvm_read(kd, (u_long)proc.p_vmspace, (char *)&vmspace, sizeof(vmspace)); kp->ki_size = vmspace.vm_map.size; - kp->ki_rssize = vmspace.vm_swrss; /* XXX */ + /* + * Approximate the kernel's method of calculating + * this field. + */ +#define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) + kp->ki_rssize = pmap_resident_count(&vmspace.vm_pmap); kp->ki_swrss = vmspace.vm_swrss; kp->ki_tsize = vmspace.vm_tsize; kp->ki_dsize = vmspace.vm_dsize; ==== //depot/projects/nand2/libexec/rtld-elf/mips/rtld_start.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/mips/rtld_start.S,v 1.2 2010/03/04 04:53:05 imp Exp $ + * $FreeBSD: src/libexec/rtld-elf/mips/rtld_start.S,v 1.3 2010/06/16 16:39:01 jchandra Exp $ */ #include @@ -68,7 +68,8 @@ move a0, s0 /* sp */ PTR_ADDU a1, sp, 2*PTR_SIZE /* &our atexit function */ PTR_ADDU a2, sp, 3*PTR_SIZE /* obj_main entry */ - jal _C_LABEL(_rtld) /* v0 = _rtld(sp, cleanup, objp) */ + PTR_LA t9, _C_LABEL(_rtld) + jalr t9 /* v0 = _rtld(sp, cleanup, objp) */ nop PTR_L a1, 2*PTR_SIZE(sp) /* our atexit function */ @@ -123,7 +124,7 @@ move s0, sp move a0, v1 /* old GP */ - subu a0, a0, 0x7ff0 /* The offset of $gp from the */ + PTR_SUBU a0, a0, 0x7ff0 /* The offset of $gp from the */ /* beginning of the .got section: */ /* $gp = .got + 0x7ff0, so */ /* .got = $gp - 0x7ff0 */ @@ -136,7 +137,8 @@ and a0, a0, 0x7fffffff move a1, t8 /* symbol index */ - jal _C_LABEL(_mips_rtld_bind) + PTR_LA t9, _C_LABEL(_mips_rtld_bind) + jalr t9 nop move sp, s0 ==== //depot/projects/nand2/release/scripts/ports-install.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/ports-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $ +# $FreeBSD: src/release/scripts/ports-install.sh,v 1.4 2010/06/19 09:33:11 brian Exp $ # if [ "`id -u`" != "0" ]; then @@ -8,5 +8,5 @@ exit 1 fi echo "Extracting ports tarball into ${DESTDIR}/usr" -cat ports.tgz | tar --unlink -xpzf - -C ${DESTDIR}/usr +tar --unlink -xpzf ports.tgz -C ${DESTDIR}/usr exit 0 ==== //depot/projects/nand2/sbin/fsck_ffs/main.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.59 2010/04/24 07:05:35 jeff Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.60 2010/06/22 00:26:07 delphij Exp $"); #include #include @@ -388,16 +388,18 @@ /* * Determine if we can and should do journal recovery. */ - if ((sblock.fs_flags & (FS_SUJ | FS_NEEDSFSCK)) == FS_SUJ) { - if (preen || reply("USE JOURNAL?")) { - if (suj_check(filesys) == 0) { - if (chkdoreload(mntp) == 0) - exit(0); - exit(4); + if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { + if (preen || reply("USE JOURNAL?")) { + if (suj_check(filesys) == 0) { + printf("\n***** FILE SYSTEM MARKED CLEAN *****\n"); + if (chkdoreload(mntp) == 0) + exit(0); + exit(4); + } } - /* suj_check failed, fall through. */ + printf("** Skipping journal, falling through to full fsck\n\n"); } - printf("** Skipping journal, falling through to full fsck\n"); /* * Write the superblock so we don't try to recover the * journal on another pass. ==== //depot/projects/nand2/sbin/fsck_ffs/suj.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.2 2010/04/24 07:58:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.3 2010/06/22 00:26:07 delphij Exp $"); #include #include @@ -37,12 +37,15 @@ #include #include +#include +#include #include #include #include #include #include #include +#include #include #include @@ -141,7 +144,10 @@ uint64_t jbytes; uint64_t jrecs; +static jmp_buf jmpbuf; + typedef void (*ino_visitor)(ino_t, ufs_lbn_t, ufs2_daddr_t, int); +static void err_suj(const char *, ...) __dead2; static void ino_trunc(ino_t, off_t); static void ino_decr(ino_t); static void ino_adjust(struct suj_ino *); @@ -155,11 +161,30 @@ a = malloc(n); if (a == NULL) - errx(1, "malloc(%zu)", n); + err(EX_OSERR, "malloc(%zu)", n); return (a); } /* + * When hit a fatal error in journalling check, print out + * the error and then offer to fallback to normal fsck. + */ +static void +err_suj(const char * restrict fmt, ...) +{ + va_list ap; + + if (preen) + (void)fprintf(stdout, "%s: ", cdevname); + + va_start(ap, fmt); + (void)vfprintf(stdout, fmt, ap); + va_end(ap); + + longjmp(jmpbuf, -1); +} + +/* * Open the given provider, load superblock. */ static void @@ -169,9 +194,9 @@ return; disk = malloc(sizeof(*disk)); if (disk == NULL) - errx(1, "malloc(%zu)", sizeof(*disk)); + err(EX_OSERR, "malloc(%zu)", sizeof(*disk)); if (ufs_disk_fillout(disk, devnam) == -1) { - err(1, "ufs_disk_fillout(%s) failed: %s", devnam, + err(EX_OSERR, "ufs_disk_fillout(%s) failed: %s", devnam, disk->d_error); } fs = &disk->d_fs; @@ -203,9 +228,9 @@ fs->fs_time = time(NULL); fs->fs_mtime = time(NULL); if (sbwrite(disk, 0) == -1) - err(1, "sbwrite(%s)", devnam); + err(EX_OSERR, "sbwrite(%s)", devnam); if (ufs_disk_close(disk) == -1) - err(1, "ufs_disk_close(%s)", devnam); + err(EX_OSERR, "ufs_disk_close(%s)", devnam); free(disk); disk = NULL; fs = NULL; @@ -221,10 +246,8 @@ struct cghd *hd; struct suj_cg *sc; - if (cgx < 0 || cgx >= fs->fs_ncg) { - abort(); - errx(1, "Bad cg number %d", cgx); - } + if (cgx < 0 || cgx >= fs->fs_ncg) + err_suj("Bad cg number %d\n", cgx); if (lastcg && lastcg->sc_cgx == cgx) return (lastcg); hd = &cghash[SUJ_HASH(cgx)]; @@ -241,7 +264,7 @@ LIST_INSERT_HEAD(hd, sc, sc_next); if (bread(disk, fsbtodb(fs, cgtod(fs, sc->sc_cgx)), sc->sc_cgbuf, fs->fs_bsize) == -1) - err(1, "Unable to read cylinder group %d", sc->sc_cgx); + err_suj("Unable to read cylinder group %d\n", sc->sc_cgx); return (sc); } @@ -344,7 +367,7 @@ dblk->db_buf = errmalloc(size); dblk->db_size = size; if (bread(disk, fsbtodb(fs, blk), dblk->db_buf, size) == -1) - err(1, "Failed to read data block %jd", blk); + err_suj("Failed to read data block %jd\n", blk); } return (dblk->db_buf); } @@ -370,7 +393,7 @@ continue; if (bwrite(disk, fsbtodb(fs, dblk->db_blk), dblk->db_buf, dblk->db_size) == -1) - err(1, "Unable to write block %jd", + err_suj("Unable to write block %jd\n", dblk->db_blk); } } @@ -403,7 +426,7 @@ iblk->ib_blk = blk; LIST_INSERT_HEAD(hd, iblk, ib_next); if (bread(disk, fsbtodb(fs, blk), iblk->ib_buf, fs->fs_bsize) == -1) - err(1, "Failed to read inode block %jd", blk); + err_suj("Failed to read inode block %jd\n", blk); found: sc->sc_lastiblk = iblk; off = ino_to_fsbo(fs, ino); @@ -447,7 +470,7 @@ return; if (bwrite(disk, fsbtodb(fs, iblk->ib_blk), iblk->ib_buf, fs->fs_bsize) == -1) - err(1, "Failed to write inode block %jd", iblk->ib_blk); + err_suj("Failed to write inode block %jd\n", iblk->ib_blk); } static int @@ -679,9 +702,9 @@ return (0); level = lbn_level(cur); if (level == -1) - errx(1, "Invalid indir lbn %jd", lbn); + err_suj("Invalid indir lbn %jd\n", lbn); if (level == 0 && lbn < 0) - errx(1, "Invalid lbn %jd", lbn); + err_suj("Invalid lbn %jd\n", lbn); bap2 = (void *)dblk_read(blk, fs->fs_bsize); bap1 = (void *)bap2; lbnadd = 1; @@ -693,7 +716,7 @@ else i = (-lbn - base) / lbnadd; if (i < 0 || i >= NINDIR(fs)) - errx(1, "Invalid indirect index %d produced by lbn %jd", + err_suj("Invalid indirect index %d produced by lbn %jd\n", i, lbn); if (level == 0) cur = base + (i * lbnadd); @@ -705,10 +728,8 @@ blk = bap2[i]; if (cur == lbn) return (blk); - if (level == 0) { - abort(); - errx(1, "Invalid lbn %jd at level 0", lbn); - } + if (level == 0) + err_suj("Invalid lbn %jd at level 0\n", lbn); return indir_blkatoff(blk, ino, cur, lbn); } @@ -762,7 +783,8 @@ continue; return indir_blkatoff(DIP(ip, di_ib[i]), ino, -cur - i, lbn); } - errx(1, "lbn %jd not in ino", lbn); + err_suj("lbn %jd not in ino\n", lbn); + /* NOTREACHED */ } /* @@ -851,7 +873,7 @@ dpoff += dp->d_reclen; } while (dpoff <= doff); if (dpoff > fs->fs_bsize) - errx(1, "Corrupt directory block in dir ino %d", parent); + err_suj("Corrupt directory block in dir ino %d\n", parent); /* Not found. */ if (dpoff != doff) { if (debug) @@ -907,7 +929,7 @@ return; level = lbn_level(lbn); if (level == -1) - errx(1, "Invalid level for lbn %jd", lbn); + err_suj("Invalid level for lbn %jd\n", lbn); if ((flags & VISIT_ROOT) == 0 && blk_isindir(blk, ino, lbn) == 0) { if (debug) printf("blk %jd ino %d lbn %jd(%d) is not indir.\n", @@ -1203,7 +1225,7 @@ uint32_t gen; if (ino == ROOTINO) - errx(1, "Attempting to free ROOTINO"); + err_suj("Attempting to free ROOTINO\n"); if (debug) printf("Truncating and freeing ino %d, nlink %d, mode %o\n", ino, DIP(ip, di_nlink), DIP(ip, di_mode)); @@ -1240,9 +1262,9 @@ nlink = DIP(ip, di_nlink); mode = DIP(ip, di_mode); if (nlink < 1) - errx(1, "Inode %d link count %d invalid", ino, nlink); + err_suj("Inode %d link count %d invalid\n", ino, nlink); if (mode == 0) - errx(1, "Inode %d has a link of %d with 0 mode.", ino, nlink); + err_suj("Inode %d has a link of %d with 0 mode\n", ino, nlink); nlink--; if ((mode & IFMT) == IFDIR) reqlink = 2; @@ -1300,8 +1322,8 @@ ip = ino_read(ino); mode = DIP(ip, di_mode) & IFMT; if (nlink > LINK_MAX) - errx(1, - "ino %d nlink manipulation error, new link %d, old link %d", + err_suj( + "ino %d nlink manipulation error, new link %d, old link %d\n", ino, nlink, DIP(ip, di_nlink)); if (debug) printf("Adjusting ino %d, nlink %d, old link %d lastmode %o\n", @@ -1359,7 +1381,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 24 02:18:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67BCD1065676; Thu, 24 Jun 2010 02:18:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14007106566C for ; Thu, 24 Jun 2010 02:18:43 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01E578FC13 for ; Thu, 24 Jun 2010 02:18:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5O2IgEP020524 for ; Thu, 24 Jun 2010 02:18:42 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5O2IgLd020522 for perforce@freebsd.org; Thu, 24 Jun 2010 02:18:42 GMT (envelope-from bfiedler@FreeBSD.org) Date: Thu, 24 Jun 2010 02:18:42 GMT Message-Id: <201006240218.o5O2IgLd020522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2010 02:18:43 -0000 http://p4web.freebsd.org/@@180175?ac=10 Change 180175 by bfiedler@freebsd-7803 on 2010/06/24 02:17:50 Further testing need on ignore-tab-expansion Affected files ... .. //depot/projects/soc2010/bsdtextproc/gabor_diff/Makefile#2 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#5 edit .. //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#5 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/Makefile#2 (text+ko) ==== @@ -1,6 +1,8 @@ # $FreeBSD$ # $OpenBSD: Makefile,v 1.2 2003/06/25 02:42:50 deraadt Exp $ +DEBUG_FLAGS+= -g + PROG= diff SRCS= diff.c diffdir.c diffreg.c CFLAGS+= -std=c99 -Wall -pedantic ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ #include "pathnames.h" int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; -int sflag, tflag, Tflag, wflag, uniflag, yflag, strip_cr, tabsize=8; +int sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize=8; int horizon, Eflag; int format, status; int fcase_behave = FCASE_SENSITIVE; @@ -296,7 +296,10 @@ push_excludes(optarg); break; case 'y': - yflag = 1; + oargv[0] = _PATH_SDIFF; + execv(_PATH_SDIFF, oargv); + _exit(127); + break; case FROMFILE_OPT: if (tofile != NULL) @@ -360,19 +363,6 @@ argc -= optind; argv += optind; - if(yflag) { - /* remove y flag from args and call sdiff */ - for(argv=oargv; argv && strcmp(*argv, "-y") != 0; argv++); - while(argv != &oargv[oargc]){ - *argv=*(argv+1); - argv++; - } - oargv[0] = _PATH_SDIFF; - *argv= "\0"; - - execv(_PATH_SDIFF, oargv); - _exit(127); - } /* * Do sanity checks, fill in stb1 and stb2 and call the appropriate ==== //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#5 (text+ko) ==== @@ -694,7 +694,7 @@ static void check(FILE *f1, FILE *f2) { - int i, j, jackpot, a, b, newcol; + int i, j, jackpot, a, b, ccol, dcol; wint_t c, d; long ctold, ctnew; wchar_t *strc, *strd; @@ -706,6 +706,7 @@ ixold[0] = ixnew[0] = 0; jackpot = 0; ctold = ctnew = 0; + ccol = dcol = 0; for (i = 1; i <= len[0]; i++) { if (J[i] == 0) { ixold[i] = ctold += skipline(f1); @@ -718,6 +719,8 @@ strc = fgetwln(f1, &lenc); strd = fgetwln(f2, &lend); + ccol = lenc; + dcol = lend; if (Bflag) { while ((lenc = 1) && (strc[0] == L'\n')) @@ -762,18 +765,38 @@ ctnew++; } } - newcol = ((b/8)+1)*8; - while ((Eflag) && (c == L'\t') && (d == L' ') && b <= newcol ) - d = strd[++b]; + if (Eflag) { + while( ((d == L'\t') && (c == L' ')) || + ( (c == L'\t') && (d == L' ')) ) { + + if(c == L'\t') { + c = strc[++a]; + ccol += (a+ccol) % tabsize; + } + + else if(d == L'\t') { + b = strd[++b]; + dcol += (b+dcol) % tabsize; + } + + while ( (d == L' ') && (b + dcol < a + ccol) && + b < lend ) + { + d = strd[++b]; + } + + while ( (c == L' ') && (a + ccol < b + dcol) && + a < lenc ) + { + c = strc[++a]; + } - newcol = ((a/8)+1)*8; - while ((Eflag) && (d == L'\t') && (c == L' ') && a <= newcol ) - c = strc[++a]; + if ((a + ccol) != (b + dcol) ) { + break; + } + } + } - if (Eflag && d == L'\t') - d = strd[++b]; - if (Eflag && c == L'\t') - c = strc[++a]; if (c != d) { @@ -1189,11 +1212,15 @@ for (i = 0; (t = getwc(f)) != L'\n'; i++) { if (t == L'\r' && strip_cr) continue; - if (t == L'\t' && Eflag) - newcol = ((i/8)+1)*8; + if (t == L'\t' && Eflag) { + newcol = ((i/tabsize)+1)*tabsize; do { sum = sum * 127 + (int) L' '; } while (++i < newcol); + + if( (t = getwc(f)) == L'\n') + break; + } if (t == EOF) { if (i == 0) From owner-p4-projects@FreeBSD.ORG Thu Jun 24 07:20:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 346111065674; Thu, 24 Jun 2010 07:20:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECC661065670; Thu, 24 Jun 2010 07:20:45 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe13.swip.net [212.247.155.129]) by mx1.freebsd.org (Postfix) with ESMTP id 549BE8FC0A; Thu, 24 Jun 2010 07:20:44 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=J50yT95GBfoA:10 a=ADBQPqJMlbwA:10 a=Q9fys5e9bTEA:10 a=M8b_wTzEtboA:10 a=MnI1ikcADjEx7bvsp0jZvQ==:17 a=6I5d2MoRAAAA:8 a=z5azl8PKR2wem9wTSbEA:9 a=dRD3_ai0JEjBYkIdwoFSAX14Zs0A:4 a=PUjeQqilurYA:10 Received: from [188.126.201.140] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe13.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 1020385671; Thu, 24 Jun 2010 09:20:43 +0200 From: Hans Petter Selasky To: Rafal Jaworowski Date: Thu, 24 Jun 2010 09:17:51 +0200 User-Agent: KMail/1.12.4 (FreeBSD/8.0-STABLE; KDE/4.3.4; amd64; ; ) References: <201006232001.o5NK1moY063395@repoman.freebsd.org> In-Reply-To: <201006232001.o5NK1moY063395@repoman.freebsd.org> X-Face: +~\`s("[*|O,="7?X@L.elg*F"OA\I/3%^p8g?ab%RN'(; _IjlA: hGE..Ew, XAQ*o#\/M~SC=S1-f9{EzRfT'|Hhll5Q]ha5Bt-s|oTlKMusi:1e[wJl}kd}GR Z0adGx-x_0zGbZj'e(Y[(UNle~)8CQWXW@:DX+9)_YlB[tIccCPN$7/L' MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201006240917.51965.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 180162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2010 07:20:46 -0000 On Wednesday 23 June 2010 22:01:48 Rafal Jaworowski wrote: > http://p4web.freebsd.org/@@180162?ac=10 > > Change 180162 by raj@raj_nand on 2010/06/23 20:01:21 > > Unlock properly in a failing case. > > Submitted by: Yohanes Nugroho > > Affected files ... > > .. //depot/projects/nand2/sys/dev/nand/nand_cdev.c#2 edit > > Differences ... > > ==== //depot/projects/nand2/sys/dev/nand/nand_cdev.c#2 (text+ko) ==== > > @@ -210,6 +210,7 @@ > if (off != 0 || (len % cg->page_size) != 0) { > printf("Not aligned write start [0x%08x] size [0x%08x]\n", > off, len); > + nandbus_lock(nandbus); > return (EINVAL); > } > nandbus_unlock() ??? --HPS From owner-p4-projects@FreeBSD.ORG Thu Jun 24 10:06:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C423A1065679; Thu, 24 Jun 2010 10:06:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 874261065676; Thu, 24 Jun 2010 10:06:13 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw1.york.ac.uk (mail-gw1.york.ac.uk [144.32.128.246]) by mx1.freebsd.org (Postfix) with ESMTP id 1CB628FC1B; Thu, 24 Jun 2010 10:06:12 +0000 (UTC) Received: from mail-gw6.york.ac.uk (mail-gw6.york.ac.uk [144.32.129.26]) by mail-gw1.york.ac.uk (8.13.6/8.13.6) with ESMTP id o5O9Zh3o002058; Thu, 24 Jun 2010 10:35:43 +0100 (BST) Received: from buffy-128.york.ac.uk ([144.32.128.160] helo=buffy.york.ac.uk) by mail-gw6.york.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1ORiqV-0002tM-M4; Thu, 24 Jun 2010 10:35:43 +0100 Received: from buffy.york.ac.uk (localhost [127.0.0.1]) by buffy.york.ac.uk (8.14.3/8.14.3) with ESMTP id o5O9Zhwg015128; Thu, 24 Jun 2010 10:35:43 +0100 (BST) (envelope-from gavin@FreeBSD.org) Received: (from ga9@localhost) by buffy.york.ac.uk (8.14.3/8.14.3/Submit) id o5O9Zh1i015127; Thu, 24 Jun 2010 10:35:43 +0100 (BST) (envelope-from gavin@FreeBSD.org) X-Authentication-Warning: buffy.york.ac.uk: ga9 set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson To: Benjamin Fiedler In-Reply-To: <1277372050.14603.21.camel@buffy.york.ac.uk> References: <201006230056.o5N0urs3015191@repoman.freebsd.org> <1277372050.14603.21.camel@buffy.york.ac.uk> Content-Type: text/plain; charset="ASCII" Content-Transfer-Encoding: quoted-printable Date: Thu, 24 Jun 2010 10:35:43 +0100 Message-ID: <1277372143.14603.23.camel@buffy.york.ac.uk> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 FreeBSD GNOME Team Port X-York-MailScanner: Found to be clean X-York-MailScanner-From: gavin@freebsd.org Cc: Perforce Change Reviews Subject: Re: PERFORCE change 180136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2010 10:06:14 -0000 On Thu, 2010-06-24 at 10:34 +0100, Gavin Atkinson wrote: > On Wed, 2010-06-23 at 00:56 +0000, Benjamin Fiedler wrote: > > http://p4web.freebsd.org/@@180136?ac=3D10 >=20 > Just a couple of small style issues... Sorry everyone, this was supposed to be a private review... Gavin From owner-p4-projects@FreeBSD.ORG Thu Jun 24 10:06:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35717106566C; Thu, 24 Jun 2010 10:06:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85246106566B; Thu, 24 Jun 2010 10:06:14 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw1.york.ac.uk (mail-gw1.york.ac.uk [144.32.128.246]) by mx1.freebsd.org (Postfix) with ESMTP id 1DAA38FC1C; Thu, 24 Jun 2010 10:06:13 +0000 (UTC) Received: from mail-gw7.york.ac.uk (mail-gw7.york.ac.uk [144.32.129.30]) by mail-gw1.york.ac.uk (8.13.6/8.13.6) with ESMTP id o5O9YBuk001850; Thu, 24 Jun 2010 10:34:11 +0100 (BST) Received: from buffy-128.york.ac.uk ([144.32.128.160] helo=buffy.york.ac.uk) by mail-gw7.york.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1ORip1-0001Vn-2k; Thu, 24 Jun 2010 10:34:11 +0100 Received: from buffy.york.ac.uk (localhost [127.0.0.1]) by buffy.york.ac.uk (8.14.3/8.14.3) with ESMTP id o5O9YAYf015113; Thu, 24 Jun 2010 10:34:10 +0100 (BST) (envelope-from gavin@FreeBSD.org) Received: (from ga9@localhost) by buffy.york.ac.uk (8.14.3/8.14.3/Submit) id o5O9YATt015112; Thu, 24 Jun 2010 10:34:10 +0100 (BST) (envelope-from gavin@FreeBSD.org) X-Authentication-Warning: buffy.york.ac.uk: ga9 set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson To: Benjamin Fiedler In-Reply-To: <201006230056.o5N0urs3015191@repoman.freebsd.org> References: <201006230056.o5N0urs3015191@repoman.freebsd.org> Content-Type: text/plain; charset="ASCII" Content-Transfer-Encoding: quoted-printable Date: Thu, 24 Jun 2010 10:34:09 +0100 Message-ID: <1277372050.14603.21.camel@buffy.york.ac.uk> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 FreeBSD GNOME Team Port X-York-MailScanner: Found to be clean X-York-MailScanner-From: gavin@freebsd.org Cc: Perforce Change Reviews Subject: Re: PERFORCE change 180136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2010 10:06:15 -0000 On Wed, 2010-06-23 at 00:56 +0000, Benjamin Fiedler wrote: > http://p4web.freebsd.org/@@180136?ac=3D10 Just a couple of small style issues... > Change 180136 by bfiedler@freebsd-7803 on 2010/06/23 00:56:51 >=20 > Add Eflag >=20 > =3D=3D=3D=3D //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.c#4 (te= xt+ko) =3D=3D=3D=3D >=20 > @@ -48,7 +48,7 @@ > =20 > int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rfla= g; > int sflag, tflag, Tflag, wflag, uniflag, yflag, strip_cr, tabsize=3D8; > -int horizon; > +int horizon, Eflag; Try to keep variable defines sorted into alphabetical order. Given the number of changes these lines are seeing at the moment, it's probably best refactoring them in one go, to make this easier. Something like: int aflag, bflag, Bflag, dflag, Eflag, iflag; int lflag, Nflag, Pflag, pflag, rflag, sflag; int tflag, Tflag, wflag, uniflag, yflag; int strip_cr, horizon; int tabsize =3D 8; > -/* XXX: UNIMPLEMENTED > - { "ignore-tab-expansion", no_argument, NULL, 'E' }, */ > +/* XXX: UNIMPLEMENTED */ > + { "ignore-tab-expansion", no_argument, NULL, 'E' },=20 I'm guessing this comment is now wrong? > =3D=3D=3D=3D //depot/projects/soc2010/bsdtextproc/gabor_diff/diff.h#4 (te= xt+ko) =3D=3D=3D=3D >=20 > @@ -83,7 +83,7 @@ > }; > =20 > extern int aflag, bflag, Bflag, dflag, iflag, lflag, Nflag, Pflag, pfla= g, rflag, > - sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize; > + sflag, tflag, Tflag, wflag, uniflag, strip_cr, tabsize, Eflag; > extern int format, status, horizon; > extern int fcase_behave; > extern unsigned long long context; Same here, re variable ordering. > =3D=3D=3D=3D //depot/projects/soc2010/bsdtextproc/gabor_diff/diffreg.c#4 = (text+ko) =3D=3D=3D=3D >=20 > + newcol =3D ((b/8)+1)*8; > + while ((Eflag) && (c =3D=3D L'\t') && (d =3D=3D L' ') && b <=3D newco= l ) > + d =3D strd[++b]; > + > + newcol =3D ((a/8)+1)*8; > + while ((Eflag) && (d =3D=3D L'\t') && (c =3D=3D = L' ') && a <=3D newcol ) > + c =3D strc[++a]; This looks good, although there is too much indentation on three of the lines. It might be worth having another read over the style(9) man page, but most of the issues really are minor. It's the sort of issue that we'd want to fix up before the work ends up in the tree though, so it's worth getting it right first time. Overall, I'm pretty impressed with the work that you're committing at the moment :) Thanks, Gavin From owner-p4-projects@FreeBSD.ORG Thu Jun 24 11:21:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C75E106574F; Thu, 24 Jun 2010 11:21:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FF36106574A for ; Thu, 24 Jun 2010 11:21:38 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C5288FC2B for ; Thu, 24 Jun 2010 11:21:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5OBLcIi090993 for ; Thu, 24 Jun 2010 11:21:38 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5OBLbDv090991 for perforce@freebsd.org; Thu, 24 Jun 2010 11:21:37 GMT (envelope-from mav@freebsd.org) Date: Thu, 24 Jun 2010 11:21:37 GMT Message-Id: <201006241121.o5OBLbDv090991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2010 11:21:38 -0000 http://p4web.freebsd.org/@@180185?ac=10 Change 180185 by mav@mav_mavtest on 2010/06/24 11:21:05 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/pkill/pkill.1#4 integrate .. //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#16 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 integrate .. //depot/projects/scottl-camlock/src/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/scottl-camlock/src/etc/login.conf#4 integrate .. //depot/projects/scottl-camlock/src/etc/namedb/named.root#4 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/daily/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/Makefile#14 integrate .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/crt1_s.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/ru_RU.KOI8-R.msg#3 integrate .. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/scottl-camlock/src/release/scripts/ports-install.sh#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/suj.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/boot.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/check.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/dir.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/fat.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#8 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/sched/gsched.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/core/geom.c#6 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/core/geom.h#4 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/misc/subr.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/misc/subr.h#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ping/ping.c#3 integrate .. //depot/projects/scottl-camlock/src/share/examples/perfmon/perfmon.c#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/c99.7#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#40 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#27 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_exception.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/asmacros.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/ficl.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#27 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#61 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#81 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#32 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#32 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.n32#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_nvidia.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/fbreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptiop/hptiop.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iiconf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_bus_subr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_bus_subr.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudioreg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_misc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_rue.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#50 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_io.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_io.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vnops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#34 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/apic_vector.s#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/atpic_vector.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/exception.s#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/support.s#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/md_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/npx.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pcb.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/npx.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/isa/rtc.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_et.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/kern_malloc.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_module.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sdt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_tc.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/makesyscalls.sh#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#44 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_devstat.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_fattime.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_lock.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_mchain.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_module.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_param.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_unit.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/systrace_args.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf2.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#38 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_wdog.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xxreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/XLRN32#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/include/asm.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pte.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/setjmp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/vm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/vmparam.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#11 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/stack_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/board.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/board.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mqueue/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/include/npx.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/interrupt.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/nexus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/interrupt.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/intr_machdep.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/ocpbus.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/openpicvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/atpic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/opic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/pci_ocp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_pcib_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_pcibus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cpcht.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/grackle.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/hrowpic.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/kiic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/macio.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/openpic_macio.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorth.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorthpci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/intr_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mp_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/openpic.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pic_if.m#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/ebus/ebus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/isa/ofw_isa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/fire.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pcib_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/hv_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/pcpu.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/sys/timeet.h#1 branch .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/x86/cpufreq/est.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/x86/isa/atrtc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/x86/isa/clock.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/x86/x86/local_apic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/x86/x86/timeevents.c#1 branch .. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#13 integrate .. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/README#3 integrate .. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/parallelism.csh#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/runit.pl#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/tinybsd/conf/default/TINYBSD#3 integrate .. //depot/projects/scottl-camlock/src/tools/tools/tinybsd/conf/vpn/TINYBSD#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/c99/c99.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/du/du.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/du/du.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/vmstat.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ypwhich/ypwhich.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cpucontrol/amd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cpucontrol/intel.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mptutil/mptutil.8#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/dist.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/install.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/misc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/sysinstall.8#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/sysinstall.h#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/timed/timed/measure.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/pkill/pkill.1#4 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.6 2010/03/02 07:20:46 joel Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.7 2010/06/20 08:48:30 brian Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -156,14 +156,16 @@ matches processes not in jail. .It Fl l Long output. -Print the process name in addition to the process ID for each matching +For +.Nm pgrep , +print the process name in addition to the process ID for each matching process. If used in conjunction with .Fl f , print the process ID and the full argument list for each matching process. -This option can only be used with the -.Nm pgrep -command. +For +.Nm pkill , +display the kill command used for each process killed. .It Fl n Select only the newest (most recently started) of the matching processes. .It Fl o ==== //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.10 2010/03/02 07:20:46 joel Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.11 2010/06/20 08:48:30 brian Exp $"); #include #include @@ -128,7 +128,7 @@ { char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q, *pidfile; const char *execf, *coref; - int ancestors, debug_opt; + int ancestors, debug_opt, did_action; int i, ch, bestidx, rv, criteria, pidfromfile, pidfilelock; size_t jsz; int (*action)(const struct kinfo_proc *); @@ -242,8 +242,6 @@ criteria = 1; break; case 'l': - if (!pgrep) - usage(); longfmt = 1; break; case 'n': @@ -530,16 +528,24 @@ /* * Take the appropriate action for each matched process, if any. */ + did_action = 0; for (i = 0, rv = 0, kp = plist; i < nproc; i++, kp++) { if (PSKIP(kp)) continue; if (selected[i]) { + if (longfmt && !pgrep) { + did_action = 1; + printf("kill -%d %d\n", signum, kp->ki_pid); + } if (inverse) continue; } else if (!inverse) continue; rv |= (*action)(kp); } + if (!did_action && !pgrep && longfmt) + fprintf(stderr, + "No matching processes belonging to you were found\n"); exit(rv ? STATUS_MATCH : STATUS_NOMATCH); } @@ -552,7 +558,7 @@ if (pgrep) ustr = "[-LSfilnoqvx] [-d delim]"; else - ustr = "[-signal] [-ILfinovx]"; + ustr = "[-signal] [-ILfilnovx]"; fprintf(stderr, "usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n" ==== //depot/projects/scottl-camlock/src/bin/sh/parser.c#16 (text+ko) ==== @@ -36,10 +36,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.81 2010/06/19 10:33:04 jilles Exp $"); #include #include +#include #include "shell.h" #include "parser.h" ==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 (text+ko) ==== @@ -45,7 +45,7 @@ #undef input #undef unput #else -/* +/* * Define YY_INPUT for flex since input() can't be re-defined. */ #define YY_INPUT(buf,result,max_size) \ @@ -60,6 +60,19 @@ buf[n] = *yypcb->pcb_strptr++; \ result = n; \ } +/* + * Do not EOF let tokens to be put back. This does not work with flex. + * On the other hand, leaving current buffer in same state it was when + * last EOF was received guarantees that input() will keep returning EOF + * for all subsequent invocations, which is the effect desired. + */ +#undef unput +#define unput(c) \ + do { \ + int _c = c; \ + if (_c != EOF) \ + yyunput(_c, yytext_ptr); \ + } while(0) #endif static int id_or_type(const char *); @@ -811,8 +824,7 @@ longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); } - if (c0 != EOF) - unput(c0); + unput(c0); return (ttok); } ==== //depot/projects/scottl-camlock/src/contrib/binutils/binutils/doc/readelf.1#2 (text+ko) ==== @@ -247,14 +247,6 @@ .PD Displays the contents of the file's unwind section, if it has one. Only the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. -.IP "\fB\-u\fR" 4 -.IX Item "-u" -.PD 0 -.IP "\fB\-\-unwind\fR" 4 -.IX Item "--unwind" -.PD -Displays the contents of the file's unwind section, if it has one. Only -the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. .IP "\fB\-d\fR" 4 .IX Item "-d" .PD 0 ==== //depot/projects/scottl-camlock/src/etc/login.conf#4 (text+ko) ==== @@ -7,7 +7,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $FreeBSD: src/etc/login.conf,v 1.53 2009/06/23 20:57:27 kib Exp $ +# $FreeBSD: src/etc/login.conf,v 1.54 2010/06/19 09:21:34 brian Exp $ # # Default settings effectively disable resource limits, see the @@ -228,7 +228,7 @@ # # ## -## The dialer class should be used for a dialup PPP/SLIP accounts +## The dialer class should be used for a dialup PPP account ## Welcome messages/news suppressed ## #dialer:\ @@ -247,7 +247,7 @@ # # ## -## Site full-time 24/7 PPP/SLIP connections +## Site full-time 24/7 PPP connection ## - no time accounting, restricted to access via dialin lines ## #site:\ @@ -306,11 +306,6 @@ # :tc=subscriber: # # -#subslip|SLIP Subscriber Accounts:\ -# :tc=dialer:\ -# :tc=subscriber: -# -# #subshell|Shell Subscriber Accounts:\ # :tc=subscriber: # ==== //depot/projects/scottl-camlock/src/etc/namedb/named.root#4 (text+ko) ==== @@ -1,5 +1,5 @@ ; -; $FreeBSD: src/etc/namedb/named.root,v 1.15 2009/12/11 01:06:04 dougb Exp $ +; $FreeBSD: src/etc/namedb/named.root,v 1.16 2010/06/18 08:11:52 dougb Exp $ ; ; This file holds the information on root name servers needed to @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Dec 12, 2008 -; related version of root zone: 2008121200 +; last update: Jun 17, 2010 +; related version of root zone: 2010061700 ; ; formerly NS.INTERNIC.NET ; @@ -63,6 +63,7 @@ ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 ; ; OPERATED BY VERISIGN, INC. ; ==== //depot/projects/scottl-camlock/src/etc/periodic/daily/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.17 2008/09/21 22:02:26 sam Exp $ +# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.18 2010/06/17 12:25:47 netchild Exp $ .include @@ -8,7 +8,6 @@ 200.backup-passwd \ 330.news \ 400.status-disks \ - 404.status-zfs \ 405.status-ata-raid \ 406.status-gmirror \ 407.status-graid3 \ @@ -53,4 +52,9 @@ 500.queuerun .endif +.if ${MK_ZFS} != "no" +FILES+= 404.status-zfs \ + 800.scrub-zfs +.endif + .include ==== //depot/projects/scottl-camlock/src/gnu/lib/csu/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.32 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.33 2010/06/18 11:09:51 kib Exp $ .include MK_SSP= no @@ -17,7 +17,8 @@ CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 CFLAGS+= -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-zero-initialized-in-bss \ - -fno-zero-initialized-in-bss -fno-toplevel-reorder + -fno-zero-initialized-in-bss -fno-toplevel-reorder \ + -fno-asynchronous-unwind-tables -fno-omit-frame-pointer CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} ==== //depot/projects/scottl-camlock/src/lib/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.248 2010/06/09 19:57:20 rdivacky Exp $ +# $FreeBSD: src/lib/Makefile,v 1.249 2010/06/21 19:44:29 ed Exp $ .include @@ -138,7 +138,7 @@ _libbsnmp= libbsnmp .endif -.if ${MK_CLANG} != "no" +.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) _clang= clang .endif ==== //depot/projects/scottl-camlock/src/lib/csu/i386-elf/crt1_s.S#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $ + * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $ */ @@ -30,15 +30,22 @@ .align 4 .globl _start .type _start, @function -_start: xorl %ebp,%ebp +_start: + .cfi_startproc + xorl %ebp,%ebp pushl %ebp + .cfi_def_cfa_offset 4 movl %esp,%ebp + .cfi_offset %ebp,-8 + .cfi_def_cfa_register %ebp andl $0xfffffff0,%esp # align stack leal 8(%ebp),%eax pushl %eax # argv pushl 4(%ebp) # argc pushl %edx # rtld cleanup call _start1 + int3 + .cfi_endproc .size _start, . - _start - .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $" + .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $" ==== //depot/projects/scottl-camlock/src/lib/libc/nls/ru_RU.KOI8-R.msg#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.2 2009/03/21 10:10:33 maxim Exp $ +$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.3 2010/06/20 06:52:10 maxim Exp $ $ $ Message catalog for ru_RU.KOI8-R locale $ @@ -183,6 +183,16 @@ 87 Атрибут не найден $ EDOOFUS 88 Ошибка программирования +$ EBADMSG +89 Плохой формат сообщения +$ EMULTIHOP +90 Попытка мультихопа +$ ENOLINK +91 Канал разорван +$ EPROTO +92 Ошибка протокола +$ ENOTCAPABLE +93 Недостаточно возможностей $ $ strsignal() support catalog $ ==== //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.102 2009/12/10 21:16:16 brooks Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.103 2010/06/18 01:17:16 sbruno Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -323,7 +323,12 @@ (void)kvm_read(kd, (u_long)proc.p_vmspace, (char *)&vmspace, sizeof(vmspace)); kp->ki_size = vmspace.vm_map.size; - kp->ki_rssize = vmspace.vm_swrss; /* XXX */ + /* + * Approximate the kernel's method of calculating + * this field. + */ +#define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) + kp->ki_rssize = pmap_resident_count(&vmspace.vm_pmap); kp->ki_swrss = vmspace.vm_swrss; kp->ki_tsize = vmspace.vm_tsize; kp->ki_dsize = vmspace.vm_dsize; ==== //depot/projects/scottl-camlock/src/release/scripts/ports-install.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/ports-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $ +# $FreeBSD: src/release/scripts/ports-install.sh,v 1.4 2010/06/19 09:33:11 brian Exp $ # if [ "`id -u`" != "0" ]; then @@ -8,5 +8,5 @@ exit 1 fi echo "Extracting ports tarball into ${DESTDIR}/usr" -cat ports.tgz | tar --unlink -xpzf - -C ${DESTDIR}/usr +tar --unlink -xpzf ports.tgz -C ${DESTDIR}/usr exit 0 ==== //depot/projects/scottl-camlock/src/sbin/fsck_ffs/main.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.59 2010/04/24 07:05:35 jeff Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.60 2010/06/22 00:26:07 delphij Exp $"); #include #include @@ -388,16 +388,18 @@ /* * Determine if we can and should do journal recovery. */ - if ((sblock.fs_flags & (FS_SUJ | FS_NEEDSFSCK)) == FS_SUJ) { - if (preen || reply("USE JOURNAL?")) { - if (suj_check(filesys) == 0) { - if (chkdoreload(mntp) == 0) - exit(0); - exit(4); + if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { + if (preen || reply("USE JOURNAL?")) { + if (suj_check(filesys) == 0) { + printf("\n***** FILE SYSTEM MARKED CLEAN *****\n"); + if (chkdoreload(mntp) == 0) + exit(0); + exit(4); + } } - /* suj_check failed, fall through. */ + printf("** Skipping journal, falling through to full fsck\n\n"); } - printf("** Skipping journal, falling through to full fsck\n"); /* * Write the superblock so we don't try to recover the * journal on another pass. ==== //depot/projects/scottl-camlock/src/sbin/fsck_ffs/suj.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.2 2010/04/24 07:58:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.3 2010/06/22 00:26:07 delphij Exp $"); #include #include @@ -37,12 +37,15 @@ #include #include +#include +#include #include #include #include #include #include #include +#include #include #include @@ -141,7 +144,10 @@ uint64_t jbytes; uint64_t jrecs; +static jmp_buf jmpbuf; + typedef void (*ino_visitor)(ino_t, ufs_lbn_t, ufs2_daddr_t, int); +static void err_suj(const char *, ...) __dead2; static void ino_trunc(ino_t, off_t); static void ino_decr(ino_t); static void ino_adjust(struct suj_ino *); @@ -155,11 +161,30 @@ a = malloc(n); if (a == NULL) - errx(1, "malloc(%zu)", n); + err(EX_OSERR, "malloc(%zu)", n); return (a); } /* + * When hit a fatal error in journalling check, print out + * the error and then offer to fallback to normal fsck. + */ +static void +err_suj(const char * restrict fmt, ...) +{ + va_list ap; + + if (preen) + (void)fprintf(stdout, "%s: ", cdevname); + + va_start(ap, fmt); + (void)vfprintf(stdout, fmt, ap); + va_end(ap); + + longjmp(jmpbuf, -1); +} + +/* * Open the given provider, load superblock. */ static void @@ -169,9 +194,9 @@ return; disk = malloc(sizeof(*disk)); if (disk == NULL) - errx(1, "malloc(%zu)", sizeof(*disk)); + err(EX_OSERR, "malloc(%zu)", sizeof(*disk)); if (ufs_disk_fillout(disk, devnam) == -1) { - err(1, "ufs_disk_fillout(%s) failed: %s", devnam, + err(EX_OSERR, "ufs_disk_fillout(%s) failed: %s", devnam, disk->d_error); } fs = &disk->d_fs; @@ -203,9 +228,9 @@ fs->fs_time = time(NULL); fs->fs_mtime = time(NULL); if (sbwrite(disk, 0) == -1) - err(1, "sbwrite(%s)", devnam); + err(EX_OSERR, "sbwrite(%s)", devnam); if (ufs_disk_close(disk) == -1) - err(1, "ufs_disk_close(%s)", devnam); + err(EX_OSERR, "ufs_disk_close(%s)", devnam); free(disk); disk = NULL; fs = NULL; @@ -221,10 +246,8 @@ struct cghd *hd; struct suj_cg *sc; - if (cgx < 0 || cgx >= fs->fs_ncg) { - abort(); - errx(1, "Bad cg number %d", cgx); - } + if (cgx < 0 || cgx >= fs->fs_ncg) + err_suj("Bad cg number %d\n", cgx); if (lastcg && lastcg->sc_cgx == cgx) return (lastcg); hd = &cghash[SUJ_HASH(cgx)]; @@ -241,7 +264,7 @@ LIST_INSERT_HEAD(hd, sc, sc_next); if (bread(disk, fsbtodb(fs, cgtod(fs, sc->sc_cgx)), sc->sc_cgbuf, fs->fs_bsize) == -1) - err(1, "Unable to read cylinder group %d", sc->sc_cgx); + err_suj("Unable to read cylinder group %d\n", sc->sc_cgx); return (sc); } @@ -344,7 +367,7 @@ dblk->db_buf = errmalloc(size); dblk->db_size = size; if (bread(disk, fsbtodb(fs, blk), dblk->db_buf, size) == -1) - err(1, "Failed to read data block %jd", blk); + err_suj("Failed to read data block %jd\n", blk); } return (dblk->db_buf); } @@ -370,7 +393,7 @@ continue; if (bwrite(disk, fsbtodb(fs, dblk->db_blk), dblk->db_buf, dblk->db_size) == -1) - err(1, "Unable to write block %jd", + err_suj("Unable to write block %jd\n", dblk->db_blk); } } @@ -403,7 +426,7 @@ iblk->ib_blk = blk; LIST_INSERT_HEAD(hd, iblk, ib_next); if (bread(disk, fsbtodb(fs, blk), iblk->ib_buf, fs->fs_bsize) == -1) - err(1, "Failed to read inode block %jd", blk); + err_suj("Failed to read inode block %jd\n", blk); found: sc->sc_lastiblk = iblk; off = ino_to_fsbo(fs, ino); @@ -447,7 +470,7 @@ return; if (bwrite(disk, fsbtodb(fs, iblk->ib_blk), iblk->ib_buf, fs->fs_bsize) == -1) - err(1, "Failed to write inode block %jd", iblk->ib_blk); + err_suj("Failed to write inode block %jd\n", iblk->ib_blk); } static int @@ -679,9 +702,9 @@ return (0); level = lbn_level(cur); if (level == -1) - errx(1, "Invalid indir lbn %jd", lbn); + err_suj("Invalid indir lbn %jd\n", lbn); if (level == 0 && lbn < 0) - errx(1, "Invalid lbn %jd", lbn); + err_suj("Invalid lbn %jd\n", lbn); bap2 = (void *)dblk_read(blk, fs->fs_bsize); bap1 = (void *)bap2; lbnadd = 1; @@ -693,7 +716,7 @@ else i = (-lbn - base) / lbnadd; if (i < 0 || i >= NINDIR(fs)) - errx(1, "Invalid indirect index %d produced by lbn %jd", + err_suj("Invalid indirect index %d produced by lbn %jd\n", i, lbn); if (level == 0) cur = base + (i * lbnadd); @@ -705,10 +728,8 @@ blk = bap2[i]; if (cur == lbn) return (blk); - if (level == 0) { - abort(); - errx(1, "Invalid lbn %jd at level 0", lbn); - } + if (level == 0) + err_suj("Invalid lbn %jd at level 0\n", lbn); return indir_blkatoff(blk, ino, cur, lbn); } @@ -762,7 +783,8 @@ continue; return indir_blkatoff(DIP(ip, di_ib[i]), ino, -cur - i, lbn); } - errx(1, "lbn %jd not in ino", lbn); + err_suj("lbn %jd not in ino\n", lbn); + /* NOTREACHED */ } /* @@ -851,7 +873,7 @@ dpoff += dp->d_reclen; } while (dpoff <= doff); if (dpoff > fs->fs_bsize) - errx(1, "Corrupt directory block in dir ino %d", parent); + err_suj("Corrupt directory block in dir ino %d\n", parent); /* Not found. */ if (dpoff != doff) { if (debug) @@ -907,7 +929,7 @@ return; level = lbn_level(lbn); if (level == -1) - errx(1, "Invalid level for lbn %jd", lbn); + err_suj("Invalid level for lbn %jd\n", lbn); if ((flags & VISIT_ROOT) == 0 && blk_isindir(blk, ino, lbn) == 0) { if (debug) printf("blk %jd ino %d lbn %jd(%d) is not indir.\n", @@ -1203,7 +1225,7 @@ uint32_t gen; if (ino == ROOTINO) - errx(1, "Attempting to free ROOTINO"); + err_suj("Attempting to free ROOTINO\n"); if (debug) printf("Truncating and freeing ino %d, nlink %d, mode %o\n", ino, DIP(ip, di_nlink), DIP(ip, di_mode)); @@ -1240,9 +1262,9 @@ nlink = DIP(ip, di_nlink); mode = DIP(ip, di_mode); if (nlink < 1) - errx(1, "Inode %d link count %d invalid", ino, nlink); + err_suj("Inode %d link count %d invalid\n", ino, nlink); if (mode == 0) - errx(1, "Inode %d has a link of %d with 0 mode.", ino, nlink); + err_suj("Inode %d has a link of %d with 0 mode\n", ino, nlink); nlink--; if ((mode & IFMT) == IFDIR) reqlink = 2; @@ -1300,8 +1322,8 @@ ip = ino_read(ino); mode = DIP(ip, di_mode) & IFMT; if (nlink > LINK_MAX) - errx(1, - "ino %d nlink manipulation error, new link %d, old link %d", + err_suj( + "ino %d nlink manipulation error, new link %d, old link %d\n", ino, nlink, DIP(ip, di_nlink)); if (debug) printf("Adjusting ino %d, nlink %d, old link %d lastmode %o\n", @@ -1359,7 +1381,7 @@ dirty = 0; level = lbn_level(lbn); if (level == -1) - errx(1, "Invalid level for lbn %jd", lbn); + err_suj("Invalid level for lbn %jd\n", lbn); lbnadd = 1; for (i = level; i > 0; i--) lbnadd *= NINDIR(fs); @@ -1488,7 +1510,7 @@ bn = DIP(ip, di_db[visitlbn]); if (bn == 0) - errx(1, "Bad blk at ino %d lbn %jd\n", ino, visitlbn); + err_suj("Bad blk at ino %d lbn %jd\n", ino, visitlbn); oldspace = sblksize(fs, cursize, visitlbn); newspace = sblksize(fs, size, visitlbn); if (oldspace != newspace) { @@ -1512,7 +1534,7 @@ bn = ino_blkatoff(ip, ino, visitlbn, &frags); if (bn == 0) - errx(1, "Block missing from ino %d at lbn %jd\n", + err_suj("Block missing from ino %d at lbn %jd\n", ino, visitlbn); clrsize = frags * fs->fs_fsize; buf = dblk_read(bn, clrsize); @@ -1555,7 +1577,7 @@ isat = ino_isat(rrec->jr_parent, rrec->jr_diroff, rrec->jr_ino, &mode, &isdot); if (isat && (mode & IFMT) != (rrec->jr_mode & IFMT)) - errx(1, "Inode mode/directory type mismatch %o != %o", + err_suj("Inode mode/directory type mismatch %o != %o\n", mode, rrec->jr_mode); if (debug) printf("jrefrec: op %d ino %d, nlink %d, parent %d, " @@ -1778,7 +1800,7 @@ fs->fs_cs(fs, sc->sc_cgx) = cgp->cg_cs; if (bwrite(disk, fsbtodb(fs, cgtod(fs, sc->sc_cgx)), sc->sc_cgbuf, fs->fs_bsize) == -1) - err(1, "Unable to write cylinder group %d", sc->sc_cgx); + err_suj("Unable to write cylinder group %d\n", sc->sc_cgx); } /* @@ -1970,6 +1992,7 @@ continue; diroff = mvrec->jm_oldoff; TAILQ_REMOVE(&sino->si_movs, srn, sr_next); + free(srn); ino_dup_ref(sino, refrec, diroff); } } @@ -2026,7 +2049,7 @@ TAILQ_REMOVE(&sino->si_newrecs, srn, sr_next); break; default: - errx(1, "ino_build_ref: Unknown op %d", + err_suj("ino_build_ref: Unknown op %d\n", srn->sr_rec->rec_jrefrec.jr_op); } } @@ -2056,7 +2079,7 @@ TAILQ_INSERT_TAIL(&sino->si_movs, srec, sr_next); break; default: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 24 16:35:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE8A21065673; Thu, 24 Jun 2010 16:35:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6E5C106566C for ; Thu, 24 Jun 2010 16:35:37 +0000 (UTC) (envelope-from andrius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 943548FC18 for ; Thu, 24 Jun 2010 16:35:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5OGZbQD030237 for ; Thu, 24 Jun 2010 16:35:37 GMT (envelope-from andrius@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5OGZLcR030232 for perforce@freebsd.org; Thu, 24 Jun 2010 16:35:21 GMT (envelope-from andrius@FreeBSD.org) Date: Thu, 24 Jun 2010 16:35:21 GMT Message-Id: <201006241635.o5OGZLcR030232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrius@FreeBSD.org using -f From: Andrius Morkunas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2010 16:35:38 -0000 http://p4web.freebsd.org/@@180189?ac=10 Change 180189 by andrius@klevas on 2010/06/24 16:34:52 Add some patches for ports. Affected files ... .. //depot/projects/soc2010/clangports/patches/Gofer-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/ayttm-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/bash3-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/bsd.gnome.mk-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/cln-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/edb-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/ffmpeg-devel-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/ffmpegthumbnailer-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/gcc42-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/gcc43-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/gcc44-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/gcc45-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/gcc46-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/gicq-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/gmerlin-avdecoder-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/gxanim-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/jbigkit-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/libgnomecanvasmm26-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/ptlib26-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/pwlib-clang.diff#1 add .. //depot/projects/soc2010/clangports/patches/xosd-clang.diff#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 17:37:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43E0F1065673; Thu, 24 Jun 2010 17:37:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0693B1065670 for ; Thu, 24 Jun 2010 17:37:46 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E776F8FC12 for ; Thu, 24 Jun 2010 17:37:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5OHbjd0046756 for ; Thu, 24 Jun 2010 17:37:45 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5OHbjV3046754 for perforce@freebsd.org; Thu, 24 Jun 2010 17:37:45 GMT (envelope-from afiveg@FreeBSD.org) Date: Thu, 24 Jun 2010 17:37:45 GMT Message-Id: <201006241737.o5OHbjV3046754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2010 17:37:46 -0000 http://p4web.freebsd.org/@@180191?ac=10 Change 180191 by afiveg@cottonmouth on 2010/06/24 17:36:53 cosmetic fixes Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#3 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#3 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#11 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#9 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#10 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#8 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#14 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#14 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#3 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#3 (text+ko) ==== @@ -133,9 +133,6 @@ return (-1); } - /* STOP CAPTURING */ - // ringmap_disable_capturing(); - #if (__RINGMAP_DEB) printf("[%s] Number of descriptors: %d \n", __func__, SLOTS_NUMBER); #endif @@ -203,23 +200,19 @@ } p->ring->slot[i].mbuf.user = (vm_offset_t)tmp_addr; + /* Map packet data */ memoffset = (off_t)p->ring->slot[i].packet.phys; tmp_addr = - mmap ( - 0, /* System will choose the addrress */ - MCLBYTES, /* Size of region = mbuf cluster */ - PROT_WRITE|PROT_READ, /* protection: write & read */ - MAP_SHARED, /* shared maping */ - devmem_fd, /* device is /dev/mem */ - memoffset /* offset is physical addres */ - ); + mmap(0, MCLBYTES, PROT_WRITE|PROT_READ, MAP_SHARED, + devmem_fd, memoffset); if (tmp_addr == MAP_FAILED){ - printf(ERR_PREFIX"[%s] Mapping of packet buffer %d failed! Exit!\n", __func__, i); + printf(ERR_PREFIX"[%s] Mapping of packets buffer %d failed! Exit!\n", __func__, i); return -1; } p->ring->slot[i].packet.user = (vm_offset_t)tmp_addr; + // /* Map descriptor structure */ // memoffset = (off_t)p->ring->slot[i].descriptor.phys; // tmp_addr = @@ -257,16 +250,13 @@ // p->buffer_2048 = 0; // p->buffer_4096 = 0; - /* Disable Flow Control on the NIC */ - // ioctl(ringmap_cdev_fd, IOCTL_DISABLE_FLOWCNTR); /* Close memory device */ if (close(devmem_fd) == -1){ perror("close()"); } - /* START CAPTURING */ - //ringmap_enable_capturing(); + RINGMAP_FUNC_DEBUG(end); return (0); } @@ -279,8 +269,6 @@ { int tmp_res, i; - // ringmap_disable_capturing(); - RINGMAP_FUNC_DEBUG(start); for (i = 0; i < SLOTS_NUMBER; i++){ @@ -321,28 +309,38 @@ pcap_read_ringmap(pcap_t *p, int cnt, pcap_handler callback, u_char *user) { unsigned int ws, wait_flag = 1, tmp_dist; + unsigned int curr_slot; struct mbuf *mb; caddr_t datap; struct pcap_pkthdr pkthdr; + struct ring *ring; RINGMAP_FUNC_DEBUG(start); + if (p->ring == NULL){ + RINGMAP_ERROR(Ring is not allocated); + + exit (1); + } + + ring = p->ring; + if (p->break_loop) { p->break_loop = 0; return (-2); } -again1: +again: #ifdef __RINGMAP_DEB - printf("[%s] user kern distance = %d\n", __func__, - SW_TAIL_TO_HEAD_DIST(p->ring)); + printf("[%s] user to kern distance = %d\n", __func__, + SW_TAIL_TO_HEAD_DIST(ring)); #endif - if ( RING_IS_EMPTY(p->ring) ) { + if ( RING_IS_EMPTY(ring) ) { /* Sleep and wait for new incoming packets */ ioctl(ringmap_cdev_fd, IOCTL_SLEEP_WAIT); - goto again1; + goto again; } if (cnt == -1) @@ -358,15 +356,18 @@ return (cnt - ws); } - mb = (struct mbuf *)p->ring->slot[p->ring->userrp].mbuf.user; + curr_slot = R_MODULO(SW_TAIL(ring) + 1); + + mb = (struct mbuf *)ring->slot[curr_slot].mbuf.user; - pkthdr.ts = p->ring->slot[p->ring->userrp].ts; + pkthdr.ts = ring->slot[curr_slot].ts; pkthdr.caplen = pkthdr.len = mb->m_len; - datap = (caddr_t)p->ring->slot[p->ring->userrp].packet.user; + datap = (caddr_t)ring->slot[curr_slot].packet.user; (*callback)(user, &pkthdr, datap); - INC_TAIL(p->ring); + INC_TAIL(ring); + ring->pkt_counter++; --ws; } @@ -376,42 +377,9 @@ return (cnt - ws); } -/* - * Set hardware registers to enabling pkts receive and interrupts on NIC - */ -//void -//ringmap_enable_capturing() -//{ -// if (ringmap_cdev_fd > 0){ -// ioctl(ringmap_cdev_fd, IOCTL_ENABLE_RECEIVE); -// }else{ -// printf("[%s] Error: Wrong descriptor of /dev/fiveg_cdev \n", __func__); -// printf("[%s] Error: Can't enable pkt receive \n", __func__); -// -// /* TODO: set return and check returned value */ -// exit(1); -// } -//} /* - * Set hardware registers to disabling pkts receive and interrupts on NIC - */ -//void -//ringmap_disable_capturing() -//{ -// if (ringmap_cdev_fd > 0) -// ioctl(ringmap_cdev_fd, IOCTL_DISABLE_RECEIVE); -// else{ -// printf("[%s] Error: Wrong descriptor of /dev/fiveg_cdev \n", __func__); -// printf("[%s] Error: Can't disable pkt receive \n", __func__); -// -// /* TODO: set return and check returned value */ -// exit(1); -// } -//} - -/* - * Prints Kern(Hardware)- and User(Software)-Pointers + * Prints HEAD (kern) and TAIL (user) pointers * Return Value: * -1 - Error */ @@ -423,8 +391,8 @@ if (p->ring == NULL) return (-1); - printf("Hardware Pointer (kern) = %d\n", p->ring->kernrp); - printf("Software Pointer (user) = %d\n", p->ring->userrp); + printf("HEAD Pointer (kern) = %d\n", SW_HEAD(p->ring)); + printf("TAIL Pointer (user) = %d\n", SW_TAIL(p->ring)); return (err); } @@ -434,16 +402,20 @@ { int err = 0; - if (p->ring == NULL) + if (p->ring == NULL){ + RINGMAP_ERROR(Ring is not allocated!); + return (-1); + } printf("\nSYSTEM STATISTICS:\n"); printf("----------------- \n"); - printf("Kernel waited for user capturing process: %llu\n", p->ring->kern_wait_user); - printf("Capturing User process waited for kernel: %llu\n", p->ring->user_wait_kern); + printf("Ring-Full counter: %llu\n", p->ring->kern_wait_user); + printf("Ring-Empty counter: %llu\n", p->ring->user_wait_kern); printf("Number of interrupts: %llu\n", p->ring->interrupts_counter); - // printf("Packets per Interrupt: %llu\n", (((unsigned long long )p->pkt_counter) / p->ring->interrupts_counter)); + printf("Packets per Interrupt: %llu\n", + (((unsigned long long )p->ring->pkt_counter) / p->ring->interrupts_counter)); return (err); } ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#11 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#10 (text+ko) ==== @@ -132,17 +132,10 @@ return (-1); } - /* Set ring fields in the initial state */ - ring->kern_wait_user = 0; - ring->user_wait_kern = 0; - ring->interrupts_counter = 0; - RINGMAP_HW_WRITE_TAIL(adapter, (R_MODULO(RINGMAP_HW_READ_HEAD(adapter) - 1))); - ring->userrp = RINGMAP_HW_READ_TAIL(adapter); - ring->size = SLOTS_NUMBER; - + SW_TAIL(ring) = RINGMAP_HW_READ_TAIL(adapter); /* Set ring pointers */ for (slot_num = 0 ; slot_num < SLOTS_NUMBER ; slot_num ++){ ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#8 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#14 (text+ko) ==== @@ -107,7 +107,7 @@ switch(controller_type) { case 8254: - RINGMAP_OUTPUT(Controller Type: 8254); + RINGMAP_FUNC_DEBUG(Controller Type: 8254); /* Set ringmap pointer in the drivrs structure of adapter */ rm->funcs->set_ringmap_to_adapter = @@ -124,13 +124,13 @@ break; case 8257: - RINGMAP_OUTPUT(Controller Type: 8257); - RINGMAP_OUTPUT(Now not supported!); + RINGMAP_FUNC_DEBUG(Controller Type: 8257); + RINGMAP_FUNC_DEBUG(Now not supported!); break; default: - RINGMAP_OUTPUT(Unsupported Controller Type!); + RINGMAP_FUNC_DEBUG(Unsupported Controller Type!); } return (0); } @@ -292,6 +292,13 @@ /* Disable interrupts of adapter */ rm->funcs->disable_intr(rm->dev); + + /* Set ring fields in the initial state */ + ring->kern_wait_user = 0; + ring->user_wait_kern = 0; + ring->interrupts_counter = 0; + ring->pkt_counter = 0; + ring->size = SLOTS_NUMBER; if (rm->funcs->init_slots(rm->ring, rm->dev) == -1){ RINGMAP_ERROR(The ring is not initialized. Device will not be opened!); @@ -387,80 +394,39 @@ int err = 0, err_sleep = err_sleep; struct ringmap *ringmap = NULL; -// struct adapter *adapter = (struct adapter *)get_adapter_struct(dev); -// struct ringmap *rm = adapter->rm; -// -// unsigned int *userp = NULL; -// RINGMAP_IOCTL(start); + /* TODO: use private data to set and get ring from curr. thread */ + ringmap = get_ringmap_p(get_device_p(cdev)); + if ((ringmap == NULL) || (ringmap->ring == NULL)){ + RINGMAP_ERROR(NULL pointer. ioctl can not be accomplished); + + /* TODO: look if ENODEV is a correctly for this case */ + return(ENODEV); + } + switch( cmd ){ -// -// /* Tell to user number of descriptors */ -// case IOCTL_G_DNUM: -// RINGMAP_OUTPUT(IOCTL_G_DNUM); -// -// userp = (unsigned int *)(*(unsigned int *)data); -// if (userp == NULL){ -// RINGMAP_ERROR(NULL pointer by ioctl IOCTL_G_DNUM); -// return (EINVAL); -// } -// -// unsigned int dn = (unsigned int)adapter->num_rx_desc; -// copyout(&dn, userp, sizeof(unsigned int)); -// -// break; -// -// /* Enable Receive and Interrupts */ -// case IOCTL_ENABLE_RECEIVE: -// RINGMAP_IOCTL(IOCTL_ENABLE_RECEIVE); -// RINGMAP_HW_ENABLE_INTR(adapter); -// RINGMAP_HW_ENABLE_RECEIVE(adapter); -// break; -// -// /* Disable Receive and Interrupts */ -// case IOCTL_DISABLE_RECEIVE: -// RINGMAP_IOCTL(IOCTL_DISABLE_RECEIVE); -// RINGMAP_HW_DISABLE_INTR(adapter); -// RINGMAP_HW_DISABLE_RECEIVE(adapter); -// break; -// -// /* Disable Flow Control */ -// case IOCTL_DISABLE_FLOWCNTR: -// RINGMAP_IOCTL(IOCTL_DISABLE_FLOWCNTR); -// RINGMAP_HW_DISABLE_FLOWCONTR(adapter); -// break; -// + + /* Enable Interrupts */ + case IOCTL_ENABLE_INTR: + ringmap->funcs->enable_intr(ringmap->dev); + break; + + /* Disable Interrupts */ + case IOCTL_DISABLE_INTR: + ringmap->funcs->disable_intr(ringmap->dev); + break; + /* Sleep and wait for new frames */ case IOCTL_SLEEP_WAIT: - /* TODO: use private data to set and get ring from curr. thread */ - ringmap = get_ringmap_p(get_device_p(cdev)); - if ((ringmap != NULL) && (ringmap->ring != NULL)){ - ringmap->ring->user_wait_kern++; - ringmap->funcs->sync_head_tail(get_device_p(cdev), - ringmap->ring); - err_sleep = tsleep(ringmap, (PRI_MIN) | PCATCH, "ioctl", 0); - } else { - RINGMAP_ERROR(NULL pointer. ioctl can not be accomplished); - - /* TODO: look if ENODEV is a correctly for this case */ - return(ENODEV); - } + ringmap->ring->user_wait_kern++; + ringmap->funcs->sync_head_tail(get_device_p(cdev), ringmap->ring); + err_sleep = tsleep(ringmap, (PRI_MIN) | PCATCH, "ioctl", 0); break; /* Synchronize sowftware ring-tail with hardware-ring-tail (RDT) */ case IOCTL_SYNC_HEAD_TAIL: - /* TODO: use private data to set and get ring from curr. thread */ - ringmap = get_ringmap_p(get_device_p(cdev)); - if ((ringmap != NULL) && (ringmap->ring != NULL)){ - ringmap->funcs->sync_head_tail(get_device_p(cdev), - ringmap->ring); - } else { - RINGMAP_ERROR(NULL pointer. ioctl can not be accomplished); - - /* TODO: look if ENODEV is a correctly for this case */ - return(ENODEV); - } + ringmap->funcs->sync_head_tail(get_device_p(cdev), ringmap->ring); break; default: ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#14 (text+ko) ==== @@ -101,15 +101,15 @@ /* * Number of times kernel (hardware) waits for user process. More - * specifically, this is the number of times that the write pointer (RDT) - * bumps into the slot whose number is (userrp - RING_SAFETY_MARGIN = RDT) + * specifically, this is the number of times that the write pointer (HEAD) + * bumps into the slot whose number is stored in TAIL register * * A.K.A. Hardware is writing faster than the userprocess can read */ unsigned long long kern_wait_user; /* - * Number of times the user process bumps into the RDH. + * Number of times the user process bumps into the HEAD. * * A.K.A. User process has read everything there is to read in the ring. */ @@ -118,6 +118,13 @@ /* Counts number of hardware interrupts */ unsigned long long interrupts_counter; + /* + * Number of received packets. This variable should be changed only in + * user-space. We want to count the packets, that was seen by user-space + * process + */ + unsigned long long pkt_counter; + /* Array of slots */ struct ring_slot slot[SLOTS_NUMBER]; }; @@ -221,21 +228,28 @@ * *************************************/ #define RINGMAP_IOC_MAGIC 'T' -/* Start capturing. Enable packets receive and interrupts on NIC */ -#define IOCTL_ENABLE_RECEIVE _IO(RINGMAP_IOC_MAGIC, 3) +/* RDT = (userrp - RING_SAFETY_MARGIN) mod SLOTS_NUMBER */ +#define IOCTL_SYNC_HEAD_TAIL _IO(RINGMAP_IOC_MAGIC, 2) +/* + * Disable interrupts on NIC. In some cases it is safe + * to disable interrupts in order to avoid kernel panics + */ +#define IOCTL_DISABLE_INTR _IO(RINGMAP_IOC_MAGIC, 4) -/* Disable packets receive and interrupts on NIC */ -#define IOCTL_DISABLE_RECEIVE _IO(RINGMAP_IOC_MAGIC, 4) +/* Enable interrupts on NIC */ +#define IOCTL_ENABLE_INTR _IO(RINGMAP_IOC_MAGIC, 3) -/* Sleep and wait for new pkts in ring buffer */ +/* + * Sleep and wait for new pkts in ring buffer. By this + * system call should the user-space process be blocked + * and should be awoken from ISR or delayed ISR after the + * new packets was received. Additional in kontext of this + * syscall hardware HEAD and TAIL registers should be + * synchronized with ring->kernerp and ring->userrp + */ #define IOCTL_SLEEP_WAIT _IO(RINGMAP_IOC_MAGIC, 5) -/* Disable Flow Control */ -#define IOCTL_DISABLE_FLOWCNTR _IO(RINGMAP_IOC_MAGIC, 6) -/* RDT = (userrp - RING_SAFETY_MARGIN) mod SLOTS_NUMBER */ -#define IOCTL_SYNC_HEAD_TAIL _IO(RINGMAP_IOC_MAGIC, 2) - /********************************************** * Arithmetic in Ring Buffer **********************************************/ @@ -314,25 +328,24 @@ #define RINGMAP_PREFIX "--> RINGMAP: " #define ERR_PREFIX "--> RINGMAP ERROR: " #define WARN_PREFIX "--> RINGMAP WARN: " +#define IOCTL_PREFIX "--> RINGMAP IOCTL: " +#define INTR_PREFIX "--> RINGMAP IOCTL: " #define RINGMAP_ERROR(x) \ - printf("---> RINGMAP ERROR: [%s]: " #x "\n", __func__); + printf(ERR_PREFIX "[%s]: " #x "\n", __func__); #define RINGMAP_IOCTL(x) \ - if (RINGMAP_IOCTL_DEB) printf(" --> RINGMAP IOCTL: " #x "\n"); + if (RINGMAP_IOCTL_DEB) printf(IOCTL_PREFIX "[%s] " #x "\n", __func__); -#define RINGMAP_INTR(x) \ - if (RINGMAP_INTR_DEB) \ - printf("[%s] --> RINGMAP INTR: " #x "\n", __func__); +#define RINGMAP_INTR(x) \ + if (RINGMAP_INTR_DEB) \ + printf(INTR_PREFIX "[%s] " #x "\n", __func__); #define RINGMAP_FUNC_DEBUG(x) \ - if (__RINGMAP_DEB) printf("[%s] --> RINGMAP FUNC: " #x "\n", __func__); + if (__RINGMAP_DEB) printf(RINGMAP_PREFIX "[%s] " #x "\n", __func__); -#define RINGMAP_OUTPUT(x) \ - if (__RINGMAP_DEB) printf("--> RINGMAP: [%s]: " #x "\n", __func__); - #define RINGMAP_WARN(x) \ - if (__RINGMAP_DEB) printf("--> WARN: [%s]: " #x "\n", __func__); + if (__RINGMAP_DEB) printf(WARN_PREFIX"[%s]: " #x "\n", __func__); @@ -347,19 +360,23 @@ (unsigned int)adapter->rx_buffer_area[i].m_head->m_data,\ (unsigned int)adapter->rx_desc_base[i].buffer_addr); -#define FIVEG_PRINT_SOME_BYTES_FROM_PKT(i) \ - printf("[%s] SOME BYTES FROM PKT: %hhX %hhX %hhX %hhX %hhX\n", __func__, \ +#define FIVEG_PRINT_SOME_BYTES_FROM_PKT(i) \ + printf("[%s] SOME BYTES FROM PKT: %hhX %hhX %hhX %hhX %hhX\n", \ + __func__, \ adapter->rx_buffer_area[i].m_head->m_data[0], \ adapter->rx_buffer_area[i].m_head->m_data[1], \ adapter->rx_buffer_area[i].m_head->m_data[16], \ adapter->rx_buffer_area[i].m_head->m_data[32], \ adapter->rx_buffer_area[i].m_head->m_data[59]); #else -#define FIVEG_PRINT_SOME_BYTES_FROM_PKT(pktp) \ - printf("[%s] SOME BYTES FROM PKT: %hhX %hhX %hhX %hhX %hhX\n", __func__, \ +#define FIVEG_PRINT_SOME_BYTES_FROM_PKT(pktp) \ + printf("[%s] SOME BYTES FROM PKT: %hhX %hhX %hhX %hhX %hhX\n", \ + __func__, \ pktp[0], \ pktp[1], \ pktp[16], \ pktp[32], \ pktp[59]); #endif + + From owner-p4-projects@FreeBSD.ORG Fri Jun 25 00:46:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0902106566B; Fri, 25 Jun 2010 00:46:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 720A71065672 for ; Fri, 25 Jun 2010 00:46:38 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EF8A8FC19 for ; Fri, 25 Jun 2010 00:46:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5P0kbZW099316 for ; Fri, 25 Jun 2010 00:46:37 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5P0ka6K099312 for perforce@freebsd.org; Fri, 25 Jun 2010 00:46:36 GMT (envelope-from gpf@FreeBSD.org) Date: Fri, 25 Jun 2010 00:46:36 GMT Message-Id: <201006250046.o5P0ka6K099312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 00:46:38 -0000 http://p4web.freebsd.org/@@180201?ac=10 Change 180201 by gpf@gpf_desktop on 2010/06/25 00:45:44 experimental nfs server: - added support for more nfs v2&3 rpcs - actually everything besides rename, link, null & noop. Tested and everything seems to be working fine besides mknod rpc; can't audit paths for this one. This is actually because after creating a local fifo, I noticed that VOP_GETPARENT() does not get called for the UFS fs that the named pipe I create seems to reside in, but for some other fs that does not have this particular VOP as I've implemented it only for UFS & ZFS. Should probably look into that. - some AUDIT_ARG_VNODE1()s where called without having a locked vp - fixed - relocated the wrapper function to the vn_fullpath() KPIs to nfs_nfsdsubs.c; not sure if this is the right place but it will do for the moment. - probably some more minor fixes but it's 3:44 am and my brain is toasted Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfs/nfs_var.h#3 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#5 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#5 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#5 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsubs.c#2 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfs/nfs_var.h#3 (text+ko) ==== @@ -308,6 +308,7 @@ NFSPATHLEN_T *); void nfsd_init(void); int nfsd_checkrootexp(struct nfsrv_descript *); +void nfsrv_auditpath(vnode_t vp, vnode_t dvp, char *fname, fhandle_t *fhp, int n); /* nfs_clvfsops.c */ ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#5 (text+ko) ==== @@ -724,7 +724,7 @@ if (!error && ndp->ni_vp == NULL) { if (nvap->na_type == VREG || nvap->na_type == VSOCK) { vrele(ndp->ni_startdir); - AUDIT_ARG_MODE(nvap->na_vattr.va_mode); + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -831,9 +831,9 @@ vput(ndp->ni_dvp); return (NFSERR_BADTYPE); } + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); if (vtyp == VSOCK) { - vrele(ndp->ni_startdir); - AUDIT_ARG_MODE(nvap->na_vattr.va_mode); + vrele(ndp->ni_startdir); error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -846,7 +846,6 @@ vput(ndp->ni_dvp); return (error); } - AUDIT_ARG_MODE(nvap->na_vattr.va_mode); error = VOP_MKNOD(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); @@ -858,6 +857,7 @@ * see any reason to do the lookup. */ } + return (error); } @@ -884,6 +884,8 @@ &nvap->na_vattr); vput(ndp->ni_dvp); nfsvno_relpathbuf(ndp); + if (!error) + AUDIT_ARG_VNODE1(ndp->ni_vp); return (error); } @@ -896,7 +898,9 @@ struct nfsexstuff *exp) { int error = 0; - + + AUDIT_ARG_UPATH2(curthread, pathcp); + AUDIT_ARG_MODE(nvap->na_vattr.va_mode); if (ndp->ni_vp) { vrele(ndp->ni_startdir); nfsvno_relpathbuf(ndp); @@ -907,20 +911,21 @@ vrele(ndp->ni_vp); return (EEXIST); } - - AUDIT_ARG_MODE(nvap->na_vattr.va_mode); + error = VOP_SYMLINK(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr, pathcp); vput(ndp->ni_dvp); vrele(ndp->ni_startdir); nfsvno_relpathbuf(ndp); + if (!error) + AUDIT_ARG_VNODE1(ndp->ni_vp); /* * Although FreeBSD still had the lookup code in * it for 7/current, there doesn't seem to be any * point, since VOP_SYMLINK() returns the ni_vp. * Just vput it for v2. */ - if (!not_v2 && !error) + if (!not_v2 && !error) vput(ndp->ni_vp); return (error); } @@ -1163,8 +1168,9 @@ if (ndp->ni_dvp == vp) vrele(ndp->ni_dvp); else - vput(ndp->ni_dvp); + vput(ndp->ni_dvp); NFSVOPUNLOCK(vp, 0, p); + nfsrv_auditpath(NULL, ndp->ni_dvp, ndp->ni_cnd.cn_pnbuf, NULL, 1); } else { if (ndp->ni_dvp == ndp->ni_vp) vrele(ndp->ni_dvp); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#5 (text+ko) ==== @@ -1014,6 +1014,7 @@ nd->nd_repstat = nfsvno_getattr(vp, &nva, nd->nd_cred, p); vput(vp); + nfsrv_auditpath(vp, NULL, NULL, &fh, 1); if (!nd->nd_repstat) { tverf[0] = nva.na_atime.tv_sec; tverf[1] = nva.na_atime.tv_nsec; @@ -1232,8 +1233,7 @@ nd->nd_repstat = nfsvno_mknod(&named, &nva, nd->nd_cred, p); if (!nd->nd_repstat) { vp = named.ni_vp; - if (vp != NULL) - AUDIT_ARG_VNODE1(vp); + AUDIT_ARG_VNODE1(vp); nfsrv_fixattr(nd, vp, &nva, aclp, p, &attrbits, exp); nd->nd_repstat = nfsvno_getfh(vp, fhp, p, named.ni_dvp); if ((nd->nd_flag & ND_NFSV3) && !nd->nd_repstat) @@ -1338,6 +1338,7 @@ nd->nd_repstat = nfsvno_removesub(&named, 0, nd->nd_cred, p, exp); } + nfsrv_auditpath(NULL, named.ni_dvp, named.ni_cnd.cn_pnbuf, NULL, 1); } if (!(nd->nd_flag & ND_NFSV2)) { if (dirp) { @@ -1684,12 +1685,10 @@ if (!nd->nd_repstat) { if (dirp != NULL) dirfor_ret = nfsvno_getattr(dirp, &dirfor, nd->nd_cred, - p); + p); nfsrvd_symlinksub(nd, &named, &nva, fhp, vpp, dirp, &dirfor, &diraft, &diraft_ret, NULL, NULL, p, exp, pathcp, pathlen); - if (named.ni_vp != NULL) - AUDIT_ARG_VNODE1(named.ni_vp); } else if (dirp != NULL) { dirfor_ret = nfsvno_getattr(dirp, &dirfor, nd->nd_cred, p); vrele(dirp); @@ -1823,8 +1822,6 @@ */ nfsrvd_mkdirsub(nd, &named, &nva, fhp, vpp, dirp, &dirfor, &diraft, &diraft_ret, NULL, NULL, p, exp); - if (named.ni_vp != NULL) - AUDIT_ARG_VNODE1(named.ni_vp); if (nd->nd_flag & ND_NFSV3) { if (!nd->nd_repstat) { (void) nfsm_fhtom(nd, (u_int8_t *)fhp, 0, 1); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#5 (text+ko) ==== @@ -345,113 +345,6 @@ NFSV4OP_COMMIT, }; -/* - * XXXgpf: should relocate them someplace else - * I just dont know where:S - */ -#define PARENTHINT 0x0001 -#define EXHAUSTSEARCH 0x0002 -#define WANTNAME 0x0004 - -/* - * XXXgpf: should probably relocate this function somewhere else as it's going to be called from various - * places in fs/nfsserver/ - * - * Do our best to acquire 'a' working path for vp - * - * vp - vnode in question - * dvp - directory with vp as a child - * fname - name used to reference vp inside dvp - * fhp - file handle for vp - * n - AUDIT_ARG_UPATH1 or AUDIT_ARG_UPATH2 - */ -static void -nfsrv_auditpath(struct vnode *vp, struct vnode *dvp, char *fname, fhandle_t *fhp, int n) -{ - char path[PATH_MAX]; - struct thread *td; - char *fullpath, *freepath; - char success; - - if (!AUDITING_TD(curthread)) - return; - - td = curthread; - freepath = NULL; - success = 0; - - /* try to find the path through vp */ - if (vp != NULL) { - /* try the cache */ - vn_fullpath_global(td, vp, &fullpath, &freepath); - if (freepath != NULL) { - success = 1; - goto out; - } - - /* if our cache fails us */ - if (fhp != NULL && vp->v_mount != NULL) { - uint64_t parent_hint; - /* get the hint stored inside the file handle */ - VFS_FHHINT(vp->v_mount, &fhp->fh_fid, &parent_hint); - vn_fullpath_nocache(vp, &fullpath, &freepath, - parent_hint, PARENTHINT | WANTNAME); - if (freepath != NULL) { - success = 1; - goto out; - } - } - } - - /* try to find the path through dvp and the component name used to reference vp */ - if (dvp != NULL && fname != NULL) { - /* try the cache */ - vn_fullpath_global(td, dvp, &fullpath, &freepath); - if (freepath != NULL) { - snprintf(path, sizeof(path), "%s/%s", fullpath, fname); - fullpath = path; - success = 1; - goto out; - } - - /* if our cache fails us */ - vn_fullpath_nocache(dvp, &fullpath, &freepath, - 0, WANTNAME); - if (freepath != NULL) { - snprintf(path, sizeof(path), "%s/%s", fullpath, fname); - fullpath = path; - success = 1; - goto out; - } - } - - /* last resort, just save the name used to reference the file in question */ - if (fname != NULL) { - strlcpy(path, fname, sizeof(path)); - fullpath = path; - success = 1; - } - -out: - if (success) { - switch (n) { - case 1: - AUDIT_ARG_UPATH1(td, fullpath); - break; - case 2: - AUDIT_ARG_UPATH2(td, fullpath); - break; - default: - AUDIT_ARG_UPATH1(td, fullpath); - break; - } - } - - if (freepath != NULL) { - free(freepath, M_TEMP); - } -} - /* * Do an RPC. Basically, get the file handles translated to vnode pointers * and then call the appropriate server routine. The server routines are @@ -465,6 +358,7 @@ { int error = 0; vnode_t vp; + vnode_t AUDIT_vp; mount_t mp = NULL; struct nfsrvfh fh; struct nfsexstuff nes; @@ -548,8 +442,14 @@ if (nfs_retfh[nd->nd_procnum] == 1) { if (vp) NFSVOPUNLOCK(vp, 0, p); + AUDIT_vp = NULL; error = (*(nfsrv3_procs1[nd->nd_procnum]))(nd, isdgram, - vp, NULL, (fhandle_t *)fh.nfsrvfh_data, p, &nes); + vp, &AUDIT_vp, (fhandle_t *)fh.nfsrvfh_data, p, &nes); + if (AUDIT_vp != NULL) { + nfsrv_auditpath(AUDIT_vp, NULL, NULL, + (fhandle_t *)fh.nfsrvfh_data, 1); + vrele(AUDIT_vp); + } } else if (nfs_retfh[nd->nd_procnum] == 2) { error = (*(nfsrv3_procs2[nd->nd_procnum]))(nd, isdgram, vp, NULL, p, &nes, NULL); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsubs.c#2 (text+ko) ==== @@ -41,6 +41,7 @@ * copy data between mbuf chains and uio lists. */ #include +#include extern u_int32_t newnfs_true, newnfs_false; extern int nfs_pubfhset; @@ -2041,3 +2042,108 @@ return (1); } + +/* + * XXXgpf: should relocate them someplace else + * I just dont know where:S + */ +#define PARENTHINT 0x0001 +#define EXHAUSTSEARCH 0x0002 +#define WANTNAME 0x0004 + +/* + * XXXgpf: dont know if this is the right location for the function + * + * Do our best to acquire 'a' working path for vp + * + * vp - vnode in question + * dvp - directory with vp as a child + * fname - name used to reference vp inside dvp + * fhp - file handle for vp + * n - AUDIT_ARG_UPATH1 or AUDIT_ARG_UPATH2 + */ +void +nfsrv_auditpath(vnode_t vp, vnode_t dvp, char *fname, fhandle_t *fhp, int n) +{ + char path[PATH_MAX]; + struct thread *td; + char *fullpath, *freepath; + char success; + + if (!AUDITING_TD(curthread)) + return; + + td = curthread; + freepath = NULL; + success = 0; + + /* try to find the path through vp */ + if (vp != NULL) { + /* try the cache */ + vn_fullpath_global(td, vp, &fullpath, &freepath); + if (freepath != NULL) { + success = 1; + goto out; + } + /* if our cache fails us */ + if (fhp != NULL && vp->v_mount != NULL) { + uint64_t parent_hint; + /* get the hint stored inside the file handle */ + VFS_FHHINT(vp->v_mount, &fhp->fh_fid, &parent_hint); + vn_fullpath_nocache(vp, &fullpath, &freepath, + parent_hint, PARENTHINT | WANTNAME); + if (freepath != NULL) { + success = 1; + goto out; + } + } + } + + /* try to find the path through dvp and the component name used to reference vp */ + if (dvp != NULL && fname != NULL) { + /* try the cache */ + vn_fullpath_global(td, dvp, &fullpath, &freepath); + if (freepath != NULL) { + snprintf(path, sizeof(path), "%s/%s", fullpath, fname); + fullpath = path; + success = 1; + goto out; + } + + /* if our cache fails us */ + vn_fullpath_nocache(dvp, &fullpath, &freepath, + 0, WANTNAME); + if (freepath != NULL) { + snprintf(path, sizeof(path), "%s/%s", fullpath, fname); + fullpath = path; + success = 1; + goto out; + } + } + + /* last resort, just save the name used to reference the file in question */ + if (fname != NULL) { + strlcpy(path, fname, sizeof(path)); + fullpath = path; + success = 1; + } + +out: + if (success) { + switch (n) { + case 1: + AUDIT_ARG_UPATH1(td, fullpath); + break; + case 2: + AUDIT_ARG_UPATH2(td, fullpath); + break; + default: + AUDIT_ARG_UPATH1(td, fullpath); + break; + } + } + + if (freepath != NULL) { + free(freepath, M_TEMP); + } +} From owner-p4-projects@FreeBSD.ORG Fri Jun 25 11:37:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 975951065673; Fri, 25 Jun 2010 11:37:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 438371065670 for ; Fri, 25 Jun 2010 11:37:51 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 300108FC1F for ; Fri, 25 Jun 2010 11:37:51 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5PBbobu091073 for ; Fri, 25 Jun 2010 11:37:50 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5PBboap091071 for perforce@freebsd.org; Fri, 25 Jun 2010 11:37:50 GMT (envelope-from afiveg@FreeBSD.org) Date: Fri, 25 Jun 2010 11:37:50 GMT Message-Id: <201006251137.o5PBboap091071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 11:37:51 -0000 http://p4web.freebsd.org/@@180208?ac=10 Change 180208 by afiveg@cottonmouth on 2010/06/25 11:36:51 comments update Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#4 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#12 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#10 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#11 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#9 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#15 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#15 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#4 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#12 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#10 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#11 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#15 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#15 (text+ko) ==== @@ -45,7 +45,14 @@ }; /* - * This structure represents the ring slot. + * This structure represents the ring slot. Each slot contains three + * entities: descriptor, mbuf and packet. The descriptore represents + * the hardware view of of packet. Mbuf represents the kernel view of + * packet. The packet represents the buffer where the packet data placed. + * + * Each entity is of type 'struct address'. Struct 'address' contains + * three addresses: physical-, kernel- and user-address. We need to store + * the physical addresses to be able to do memory mapping. */ struct ring_slot { @@ -71,19 +78,28 @@ }; /* - * Packet ring buffer + * This structure represents the packets ringbuffer. The structure should be + * mapped into the user-space to be visible and accessible from the user + * capturing application. The ring contains the pointer to SLOTs array. Each + * SLOT represents one packet. Additionaly, the structure the ring-HEAD + * (kernrp) and ring-TAIL (userrp). */ struct ring { /* * kernrp - ring HEAD. Should be changed ONLY in driver. And should be - * synchronized with the hardware ring HEAD register (RDH). + * synchronized with the adapter-ring-HEAD register. Adapter increments + * the value in its HEAD-register after storing the incomming packets + * in the RAM. The driver shoud in the ISR check the value in the + * adapter-HEAD-register and set this value in kernrp. */ unsigned int volatile kernrp; /* * userrp - ring TAIL. Should be incremented by user space software after - * reading the slots with a new received packets + * reading the slots with a new received packets. The driver, while + * executing ISR shoud check the value in userrp and set this value in + * the adapter-TAIL-register. */ unsigned int volatile userrp; @@ -138,6 +154,12 @@ unsigned int controller_type; }; +/* + * This structure will be visible only in the kernel. It contains + * the pointers to the ring that should be mapped in user-space, + * to the functions for accessing the ring and for accessing to the + * device and driver structures + */ struct ringmap { /* Device structure of network adapter */ device_t dev; @@ -148,9 +170,6 @@ /* Now only one process can only one time open device */ uint32_t volatile open_cnt; - /* How many packets have counted driver in RAM */ - unsigned long long pkts_counter; - /* Hardware dependent functions */ struct ringmap_functions *funcs; @@ -380,3 +399,5 @@ #endif + + From owner-p4-projects@FreeBSD.ORG Fri Jun 25 12:48:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 180021065672; Fri, 25 Jun 2010 12:48:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0A57106564A for ; Fri, 25 Jun 2010 12:48:07 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD81E8FC12 for ; Fri, 25 Jun 2010 12:48:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5PCm7DI008073 for ; Fri, 25 Jun 2010 12:48:07 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5PCm7qI008071 for perforce@freebsd.org; Fri, 25 Jun 2010 12:48:07 GMT (envelope-from gpf@FreeBSD.org) Date: Fri, 25 Jun 2010 12:48:07 GMT Message-Id: <201006251248.o5PCm7qI008071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 12:48:08 -0000 http://p4web.freebsd.org/@@180209?ac=10 Change 180209 by gpf@gpf_desktop on 2010/06/25 12:47:41 - audit support for link, rename & null. noop is not actually a rpc so nothing more to be done. Oh and we may also consider changing null's audit class from 'no' to something else so that we may actually keep track of these "pings" to the nfs server. both new & old nfs servers: - I was wondering for some time now why my nfs audit logs nearly always reported successes, even if for example some operation was not supported. To make a long story short, we are not keeping track of the actual reply status of the rpc instead of what the pseudo-syscall returns. Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#2 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#6 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#6 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#6 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_srvkrpc.c#5 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#2 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include +#include #include NFSDLOCKMUTEX; @@ -233,6 +234,8 @@ cacherep = nfs_proc(&nd, rqst->rq_xid, xprt->xp_socket, xprt->xp_sockref, &rp); } else { + AUDIT_NFS_ENTER(NFSPROC_NULL, nd.nd_cred, curthread); + AUDIT_NFS_EXIT(0, curthread); NFSMGET(nd.nd_mreq); nd.nd_mreq->m_len = 0; cacherep = RC_REPLY; ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#6 (text+ko) ==== @@ -1121,9 +1121,16 @@ } out: if (!error) { + /* extra verfs to make the audit code less racy */ + vref(fromndp->ni_dvp); + vref(tondp->ni_dvp); error = VOP_RENAME(fromndp->ni_dvp, fromndp->ni_vp, &fromndp->ni_cnd, tondp->ni_dvp, tondp->ni_vp, &tondp->ni_cnd); + nfsrv_auditpath(NULL, fromndp->ni_dvp, fromndp->ni_cnd.cn_pnbuf, NULL, 1); + nfsrv_auditpath(NULL, tondp->ni_dvp, tondp->ni_cnd.cn_pnbuf, NULL, 2); + vrele(fromndp->ni_dvp); + vrele(tondp->ni_dvp); } else { if (tdvp == tvp) vrele(tdvp); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdserv.c#6 (text+ko) ==== @@ -1459,9 +1459,7 @@ /* * Done parsing, now down to business. - */ - if (fromnd.ni_vp != NULL) - AUDIT_ARG_VNODE1(fromnd.ni_vp); + */ nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 1, exp, p, &fdirp); if (nd->nd_repstat) { if (nd->nd_flag & ND_NFSV3) { @@ -1481,6 +1479,8 @@ nfsvno_relpathbuf(&tond); return (0); } + if (fromnd.ni_vp != NULL) + AUDIT_ARG_VNODE1(fromnd.ni_vp); if (vnode_vtype(fromnd.ni_vp) == VDIR) tond.ni_cnd.cn_flags |= WILLBEDIR; nd->nd_repstat = nfsvno_namei(nd, &tond, tdp, 0, &tnes, p, &tdirp); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#6 (text+ko) ==== @@ -451,8 +451,16 @@ vrele(AUDIT_vp); } } else if (nfs_retfh[nd->nd_procnum] == 2) { + if (vp != NULL) + vref(vp); error = (*(nfsrv3_procs2[nd->nd_procnum]))(nd, isdgram, vp, NULL, p, &nes, NULL); + if (vp != NULL) { + if (nd->nd_procnum == NFSPROC_LINK) + nfsrv_auditpath(vp, NULL, NULL, + (fhandle_t *)fh.nfsrvfh_data, 2); + vrele(vp); + } } else { if (vp != NULL) vref(vp); @@ -461,14 +469,13 @@ if (vp != NULL) { if (nd->nd_procnum != NFSPROC_CREATE && nd->nd_procnum != NFSPROC_RMDIR && - nd->nd_procnum != NFSPROC_REMOVE) { + nd->nd_procnum != NFSPROC_REMOVE) nfsrv_auditpath(vp, NULL, NULL, (fhandle_t *)fh.nfsrvfh_data, 1); - } vrele(vp); } } - AUDIT_NFS_EXIT(error, curthread); + AUDIT_NFS_EXIT(nd->nd_repstat, curthread); if (mp) { if (nfs_writerpc[nd->nd_procnum]) NFS_ENDWRITE(mp); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_srvkrpc.c#5 (text+ko) ==== @@ -355,7 +355,7 @@ AUDIT_NFS_ENTER(procnum, nd.nd_cr, td); AUDIT_ARG_SOCKADDR_IN((struct sockaddr_in *)nd.nd_nam); error = proc(&nd, NULL, &mrep); - AUDIT_NFS_EXIT(error, td); + AUDIT_NFS_EXIT(nd.nd_repstat, td); if (nd.nd_cr) crfree(nd.nd_cr); From owner-p4-projects@FreeBSD.ORG Fri Jun 25 19:41:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E31721065670; Fri, 25 Jun 2010 19:41:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A76E1106566C for ; Fri, 25 Jun 2010 19:41:46 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 92BB58FC08 for ; Fri, 25 Jun 2010 19:41:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5PJfkFM056725 for ; Fri, 25 Jun 2010 19:41:46 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5PJfkST056723 for perforce@freebsd.org; Fri, 25 Jun 2010 19:41:46 GMT (envelope-from kibab@FreeBSD.org) Date: Fri, 25 Jun 2010 19:41:46 GMT Message-Id: <201006251941.o5PJfkST056723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 19:41:47 -0000 http://p4web.freebsd.org/@@180221?ac=10 Change 180221 by kibab@kibab_kibab-nb on 2010/06/25 19:41:41 Correct some naming issues (GEOM should be uppercased, kind of convention in describing GEOM_PART_* classes). Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/bde/g_bde.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/cache/g_cache.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/concat/g_concat.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/eli/g_eli.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/gate/g_gate.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_bsd.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_fox.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_mbr.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_pc98.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_sunlabel.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/journal/g_journal.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/label/g_label.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/linux_lvm/g_linux_lvm.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/mirror/g_mirror.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/multipath/g_multipath.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_apm.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_bsd.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_ebr.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_gpt.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_mbr.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_pc98.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_vtoc8.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/raid3/g_raid3.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/shsec/g_shsec.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/stripe/g_stripe.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/uzip/g_uzip.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/virstor/g_virstor.c#3 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/bde/g_bde.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include #define BDE_CLASS_NAME "BDE" -FEATURE(geom_bde, "Geom Based Disk Encryption"); +FEATURE(geom_bde, "GEOM-based Disk Encryption"); static void g_bde_start(struct bio *bp) ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/cache/g_cache.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include -FEATURE(geom_cache, "Geom cache module"); +FEATURE(geom_cache, "GEOM cache module"); static MALLOC_DEFINE(M_GCACHE, "gcache_data", "GEOM_CACHE Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/concat/g_concat.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include -FEATURE(geom_concat, "Geom concatenation support"); +FEATURE(geom_concat, "GEOM concatenation support"); static MALLOC_DEFINE(M_CONCAT, "concat_data", "GEOM_CONCAT Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/eli/g_eli.c#3 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include -FEATURE(geom_eli, "Geom crypto module"); +FEATURE(geom_eli, "GEOM crypto module"); MALLOC_DEFINE(M_ELI, "eli data", "GEOM_ELI Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/gate/g_gate.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ #include #include -FEATURE(geom_gate, "Geom Gate"); +FEATURE(geom_gate, "GEOM Gate module"); static MALLOC_DEFINE(M_GATE, "gg_data", "GEOM Gate Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_bsd.c#3 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include -FEATURE(geom_bsd, "Geom BSD disklabels support"); +FEATURE(geom_bsd, "GEOM BSD disklabels support"); #define BSD_CLASS_NAME "BSD" ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_fox.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ #define FOX_CLASS_NAME "FOX" #define FOX_MAGIC "GEOM::FOX" -FEATURE(geom_fox, "Geom_fox redundant path mitigation support"); +FEATURE(geom_fox, "GEOM FOX redundant path mitigation support"); struct g_fox_softc { off_t mediasize; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_mbr.c#3 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include -FEATURE(geom_mbr, "Geom DOS/MBR partitioning support"); +FEATURE(geom_mbr, "GEOM DOS/MBR partitioning support"); #define MBR_CLASS_NAME "MBR" #define MBREXT_CLASS_NAME "MBREXT" ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_pc98.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include -FEATURE(geom_pc98, "Geom NEC PC9800 partitioning support"); +FEATURE(geom_pc98, "GEOM NEC PC9800 partitioning support"); #define PC98_CLASS_NAME "PC98" ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_sunlabel.c#3 (text+ko) ==== @@ -52,7 +52,7 @@ #include #include -FEATURE(geom_sunlabel, "Geom Sun/Solaris partitioning support"); +FEATURE(geom_sunlabel, "GEOM Sun/Solaris partitioning support"); #define SUNLABEL_CLASS_NAME "SUN" ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/journal/g_journal.c#3 (text+ko) ==== @@ -55,7 +55,7 @@ #include -FEATURE(geom_journal, "Geom journaling support"); +FEATURE(geom_journal, "GEOM journaling support"); /* * On-disk journal format: ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/label/g_label.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include -FEATURE(geom_label, "Geom labeling support"); +FEATURE(geom_label, "GEOM labeling support"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, label, CTLFLAG_RW, 0, "GEOM_LABEL stuff"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/linux_lvm/g_linux_lvm.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #include -FEATURE(geom_linux_lvm, "Geom Linux LVM support"); +FEATURE(geom_linux_lvm, "GEOM Linux LVM partitioning support"); /* Declare malloc(9) label */ static MALLOC_DEFINE(M_GLLVM, "gllvm", "GEOM_LINUX_LVM Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/mirror/g_mirror.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include -FEATURE(geom_mirror, "Geom mirroring support"); +FEATURE(geom_mirror, "GEOM mirroring support"); static MALLOC_DEFINE(M_MIRROR, "mirror_data", "GEOM_MIRROR Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/multipath/g_multipath.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #include #include -FEATURE(geom_multipath, "Geom multipath support"); +FEATURE(geom_multipath, "GEOM multipath support"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, multipath, CTLFLAG_RW, 0, ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_apm.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include "g_part_if.h" -FEATURE(geom_part_apm, "Geom_part Apple partitioning support"); +FEATURE(geom_part_apm, "GEOM partitioning class for Apple-style partitions"); struct g_part_apm_table { struct g_part_table base; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_bsd.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "g_part_if.h" -FEATURE(geom_part_bsd, "Geom_part BSD partitioning support"); +FEATURE(geom_part_bsd, "GEOM partitioning class for BSD disklabels"); struct g_part_bsd_table { struct g_part_table base; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_ebr.c#3 (text+ko) ==== @@ -48,9 +48,9 @@ #include "g_part_if.h" -FEATURE(geom_part_ebr, "Geom_part extended boot records support"); +FEATURE(geom_part_ebr, "GEOM partitioning class for extended boot records support"); #if defined(GEOM_PART_EBR_COMPAT) -FEATURE(geom_part_ebr_compat, "Geom_part extended boot records support: backward-compatible partition names"); +FEATURE(geom_part_ebr_compat, "GEOM EBR partitioning class: backward-compatible partition names"); #endif #define EBRSIZE 512 ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_gpt.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "g_part_if.h" -FEATURE(geom_part_gpt, "Geom_part GPT partitioning support"); +FEATURE(geom_part_gpt, "GEOM partitioning class for GPT partitions support"); CTASSERT(offsetof(struct gpt_hdr, padding) == 92); CTASSERT(sizeof(struct gpt_ent) == 128); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_mbr.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "g_part_if.h" -FEATURE(geom_part_mbr, "Geom_part MBR partitioning support"); +FEATURE(geom_part_mbr, "GEOM partitioning class for MBR support"); #define MBRSIZE 512 ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_pc98.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "g_part_if.h" -FEATURE(geom_part_pc98, "Geom_part PC-9800 disk partitioning support"); +FEATURE(geom_part_pc98, "GEOM partitioning class for PC-9800 disk partitions"); #define SECSIZE 512 ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_vtoc8.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "g_part_if.h" -FEATURE(geom_part_vtoc8, "Geom_part SMI VTOC8 disk label support"); +FEATURE(geom_part_vtoc8, "GEOM partitioning class for SMI VTOC8 disk labels"); struct g_part_vtoc8_table { struct g_part_table base; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/raid3/g_raid3.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include -FEATURE(geom_raid3, "Geom RAID-3 functionality"); +FEATURE(geom_raid3, "GEOM RAID-3 functionality"); static MALLOC_DEFINE(M_RAID3, "raid3_data", "GEOM_RAID3 Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/shsec/g_shsec.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include -FEATURE(geom_shsec, "Geom shared secret device support"); +FEATURE(geom_shsec, "GEOM shared secret device support"); static MALLOC_DEFINE(M_SHSEC, "shsec_data", "GEOM_SHSEC Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/stripe/g_stripe.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include -FEATURE(geom_stripe, "Geom striping support"); +FEATURE(geom_stripe, "GEOM striping support"); static MALLOC_DEFINE(M_STRIPE, "stripe_data", "GEOM_STRIPE Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/uzip/g_uzip.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include -FEATURE(geom_uzip, "Geom_uzip read-only compressed disks support"); +FEATURE(geom_uzip, "GEOM uzip read-only compressed disks support"); #undef GEOM_UZIP_DEBUG #ifdef GEOM_UZIP_DEBUG ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/virstor/g_virstor.c#3 (text+ko) ==== @@ -52,7 +52,7 @@ #include #include -FEATURE(g_virstor, "Geom virtual storage support"); +FEATURE(g_virstor, "GEOM virtual storage support"); /* Declare malloc(9) label */ static MALLOC_DEFINE(M_GVIRSTOR, "gvirstor", "GEOM_VIRSTOR Data"); From owner-p4-projects@FreeBSD.ORG Fri Jun 25 20:22:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BF5B1065675; Fri, 25 Jun 2010 20:22:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3217106564A for ; Fri, 25 Jun 2010 20:22:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE23A8FC08 for ; Fri, 25 Jun 2010 20:22:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5PKMVDx060806 for ; Fri, 25 Jun 2010 20:22:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5PKMUvm060803 for perforce@freebsd.org; Fri, 25 Jun 2010 20:22:30 GMT (envelope-from jhb@freebsd.org) Date: Fri, 25 Jun 2010 20:22:30 GMT Message-Id: <201006252022.o5PKMUvm060803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 20:22:32 -0000 http://p4web.freebsd.org/@@180222?ac=10 Change 180222 by jhb@jhb_jhbbsd on 2010/06/25 20:21:33 IFC @180220 Affected files ... .. //depot/projects/smpng/share/man/man9/bus_generic_new_pass.9#2 integrate .. //depot/projects/smpng/share/man/man9/bus_set_pass.9#2 integrate .. //depot/projects/smpng/share/man/man9/insmntque.9#2 integrate .. //depot/projects/smpng/share/man/man9/vfs_busy.9#2 integrate .. //depot/projects/smpng/share/man/man9/vfs_mountedfrom.9#2 integrate .. //depot/projects/smpng/share/man/man9/vfs_unbusy.9#2 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#12 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#20 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#20 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#29 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#39 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#93 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#63 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#107 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#48 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#60 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_exception.S#7 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#28 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#28 integrate .. //depot/projects/smpng/sys/amd64/include/asmacros.h#10 integrate .. //depot/projects/smpng/sys/amd64/include/mca.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#23 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#60 integrate .. //depot/projects/smpng/sys/arm/conf/DB-78XXX#8 integrate .. //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#8 integrate .. //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#8 integrate .. //depot/projects/smpng/sys/arm/conf/SHEEVAPLUG#3 integrate .. //depot/projects/smpng/sys/arm/include/bootinfo.h#2 integrate .. //depot/projects/smpng/sys/arm/include/fdt.h#1 branch .. //depot/projects/smpng/sys/arm/include/metadata.h#5 integrate .. //depot/projects/smpng/sys/arm/include/ofw_machdep.h#1 branch .. //depot/projects/smpng/sys/arm/mv/bus_space.c#2 integrate .. //depot/projects/smpng/sys/arm/mv/common.c#8 integrate .. //depot/projects/smpng/sys/arm/mv/discovery/db78xxx.c#6 delete .. //depot/projects/smpng/sys/arm/mv/discovery/discovery.c#7 integrate .. //depot/projects/smpng/sys/arm/mv/discovery/files.db78xxx#2 integrate .. //depot/projects/smpng/sys/arm/mv/files.mv#8 integrate .. //depot/projects/smpng/sys/arm/mv/gpio.c#4 integrate .. //depot/projects/smpng/sys/arm/mv/ic.c#4 integrate .. //depot/projects/smpng/sys/arm/mv/kirkwood/db88f6xxx.c#6 delete .. //depot/projects/smpng/sys/arm/mv/kirkwood/files.db88f6xxx#3 delete .. //depot/projects/smpng/sys/arm/mv/kirkwood/kirkwood.c#8 integrate .. //depot/projects/smpng/sys/arm/mv/kirkwood/sheevaplug.c#2 integrate .. //depot/projects/smpng/sys/arm/mv/kirkwood/std.db88f6xxx#3 integrate .. //depot/projects/smpng/sys/arm/mv/kirkwood/std.sheevaplug#2 integrate .. //depot/projects/smpng/sys/arm/mv/mv_machdep.c#10 integrate .. //depot/projects/smpng/sys/arm/mv/mv_pci.c#5 integrate .. //depot/projects/smpng/sys/arm/mv/mv_sata.c#4 integrate .. //depot/projects/smpng/sys/arm/mv/mvreg.h#8 integrate .. //depot/projects/smpng/sys/arm/mv/mvvar.h#5 integrate .. //depot/projects/smpng/sys/arm/mv/mvwin.h#3 integrate .. //depot/projects/smpng/sys/arm/mv/obio.c#4 delete .. //depot/projects/smpng/sys/arm/mv/orion/db88f5xxx.c#6 integrate .. //depot/projects/smpng/sys/arm/mv/orion/orion.c#7 integrate .. //depot/projects/smpng/sys/arm/mv/rtc.c#2 integrate .. //depot/projects/smpng/sys/arm/mv/timer.c#2 integrate .. //depot/projects/smpng/sys/arm/mv/twsi.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/uboot/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/ficl/ficl.h#5 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#69 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/powerpc/uboot/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/uboot/common/metadata.c#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#20 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#7 integrate .. //depot/projects/smpng/sys/cddl/dev/cyclic/cyclic.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#4 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_debug.c#2 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_load.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dtrace_subr.c#4 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#85 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#17 integrate .. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#5 integrate .. //depot/projects/smpng/sys/compat/x86bios/x86bios.h#3 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#36 integrate .. //depot/projects/smpng/sys/conf/NOTES#186 integrate .. //depot/projects/smpng/sys/conf/files#261 integrate .. //depot/projects/smpng/sys/conf/files.amd64#77 integrate .. //depot/projects/smpng/sys/conf/files.arm#18 integrate .. //depot/projects/smpng/sys/conf/files.i386#135 integrate .. //depot/projects/smpng/sys/conf/files.mips#9 integrate .. //depot/projects/smpng/sys/conf/ldscript.mips.n32#1 branch .. //depot/projects/smpng/sys/conf/options.amd64#29 integrate .. //depot/projects/smpng/sys/conf/options.arm#24 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#18 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_fujitsu.c#8 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_hp.c#4 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#17 integrate .. //depot/projects/smpng/sys/dev/acpi_support/atk0110.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#52 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_dock.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.h#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#47 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#16 integrate .. //depot/projects/smpng/sys/dev/agp/agp_nvidia.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-serverworks.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#87 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#21 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#32 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#27 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_vm.c#6 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#19 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#21 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.h#8 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#3 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#18 integrate .. //depot/projects/smpng/sys/dev/fb/vesa.c#8 integrate .. //depot/projects/smpng/sys/dev/fdt/fdt_arm.c#1 branch .. //depot/projects/smpng/sys/dev/fdt/fdtbus.c#2 integrate .. //depot/projects/smpng/sys/dev/hptiop/hptiop.c#7 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#19 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.c#9 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#15 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#18 integrate .. //depot/projects/smpng/sys/dev/md/md.c#93 integrate .. //depot/projects/smpng/sys/dev/mge/if_mge.c#9 integrate .. //depot/projects/smpng/sys/dev/mge/if_mgevar.h#3 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#5 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.h#5 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#118 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#33 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_eq.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#44 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#38 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudioreg.h#8 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_misc.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_mbus.c#2 delete .. //depot/projects/smpng/sys/dev/uart/uart_cpu_mv.c#4 delete .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_mbus.c#8 delete .. //depot/projects/smpng/sys/dev/usb/controller/ehci_mv.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#153 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_runvar.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#14 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clcomsubs.c#2 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#7 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clrpcops.c#8 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clsubs.c#6 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#14 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#12 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsocket.c#5 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#28 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_type.c#7 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#36 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#16 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#52 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#55 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#40 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#27 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#151 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#27 integrate .. //depot/projects/smpng/sys/i386/i386/atpic_vector.s#2 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#32 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#70 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#154 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#125 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#146 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#27 integrate .. //depot/projects/smpng/sys/i386/i386/tsc.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#97 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#40 integrate .. //depot/projects/smpng/sys/i386/include/mca.h#5 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#38 integrate .. //depot/projects/smpng/sys/i386/include/npx.h#12 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#17 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#68 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#33 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.S#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#100 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#56 integrate .. //depot/projects/smpng/sys/ia64/include/md_var.h#29 integrate .. //depot/projects/smpng/sys/isa/rtc.h#5 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#19 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_et.c#1 branch .. //depot/projects/smpng/sys/kern/kern_malloc.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#84 integrate .. //depot/projects/smpng/sys/kern/kern_sdt.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#157 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#40 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#31 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#94 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#102 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#91 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_fattime.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#24 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_module.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#32 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#60 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#43 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#96 integrate .. //depot/projects/smpng/sys/kern/subr_unit.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#184 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#71 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#22 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#56 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#50 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#65 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#26 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#128 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#129 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#61 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#179 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_wdog.c#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/smpng/sys/mips/conf/XLRN32#1 branch .. //depot/projects/smpng/sys/mips/include/asm.h#4 integrate .. //depot/projects/smpng/sys/mips/include/cpu.h#4 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#10 integrate .. //depot/projects/smpng/sys/mips/include/pte.h#4 integrate .. //depot/projects/smpng/sys/mips/include/setjmp.h#2 integrate .. //depot/projects/smpng/sys/mips/include/tlb.h#1 branch .. //depot/projects/smpng/sys/mips/include/vm.h#3 integrate .. //depot/projects/smpng/sys/mips/include/vmparam.h#3 integrate .. //depot/projects/smpng/sys/mips/mips/cpu.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/exception.S#5 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#11 integrate .. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#9 integrate .. //depot/projects/smpng/sys/mips/mips/pm_machdep.c#6 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#19 integrate .. //depot/projects/smpng/sys/mips/mips/stack_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/tlb.c#1 branch .. //depot/projects/smpng/sys/mips/mips/trap.c#7 integrate .. //depot/projects/smpng/sys/mips/mips/vm_machdep.c#7 integrate .. //depot/projects/smpng/sys/mips/rmi/board.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/board.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/xlr/rge.c#3 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#34 integrate .. //depot/projects/smpng/sys/modules/acpi/aibs/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mqueue/Makefile#2 integrate .. //depot/projects/smpng/sys/net/bpf.c#97 integrate .. //depot/projects/smpng/sys/net/bpf.h#27 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#24 integrate .. //depot/projects/smpng/sys/net/flowtable.c#14 integrate .. //depot/projects/smpng/sys/net/if_epair.c#5 integrate .. //depot/projects/smpng/sys/net/netisr.c#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_rssadapt.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_patch.c#2 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#20 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#39 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#33 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#40 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#65 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#43 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#99 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#17 integrate .. //depot/projects/smpng/sys/pc98/include/npx.h#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#39 integrate .. //depot/projects/smpng/sys/powerpc/aim/interrupt.c#4 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#13 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#10 integrate .. //depot/projects/smpng/sys/powerpc/aim/mp_cpudep.c#6 integrate .. //depot/projects/smpng/sys/powerpc/aim/nexus.c#5 integrate .. //depot/projects/smpng/sys/powerpc/aim/platform_chrp.c#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/interrupt.c#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#19 integrate .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#12 integrate .. //depot/projects/smpng/sys/powerpc/include/ocpbus.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#8 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/atpic.c#3 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/isa.c#2 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#10 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.h#6 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/opic.c#2 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/pci_ocp.c#7 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#8 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcibus.c#4 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#16 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cpcht.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#14 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#15 integrate .. //depot/projects/smpng/sys/powerpc/powermac/kiic.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macgpio.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#19 integrate .. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#21 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorthpci.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#21 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#17 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#18 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pic_if.m#6 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#28 integrate .. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#13 integrate .. //depot/projects/smpng/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#11 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#53 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizo.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.S#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#87 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hv_pci.c#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#21 integrate .. //depot/projects/smpng/sys/sys/buf.h#57 integrate .. //depot/projects/smpng/sys/sys/bus.h#41 integrate .. //depot/projects/smpng/sys/sys/conf.h#65 integrate .. //depot/projects/smpng/sys/sys/file.h#32 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#33 integrate .. //depot/projects/smpng/sys/sys/pmc.h#22 integrate .. //depot/projects/smpng/sys/sys/proc.h#208 integrate .. //depot/projects/smpng/sys/sys/smp.h#24 integrate .. //depot/projects/smpng/sys/sys/systm.h#100 integrate .. //depot/projects/smpng/sys/sys/time.h#29 integrate .. //depot/projects/smpng/sys/sys/timeet.h#1 branch .. //depot/projects/smpng/sys/sys/vnode.h#109 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#79 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#40 integrate .. //depot/projects/smpng/sys/vm/uma.h#25 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#80 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#36 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#113 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#50 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#79 integrate .. //depot/projects/smpng/sys/x86/cpufreq/est.c#2 integrate .. //depot/projects/smpng/sys/x86/isa/atrtc.c#2 integrate .. //depot/projects/smpng/sys/x86/isa/clock.c#4 integrate .. //depot/projects/smpng/sys/x86/x86/local_apic.c#2 integrate .. //depot/projects/smpng/sys/x86/x86/mca.c#2 integrate .. //depot/projects/smpng/sys/x86/x86/msi.c#2 integrate .. //depot/projects/smpng/sys/x86/x86/timeevents.c#1 branch Differences ... ==== //depot/projects/smpng/share/man/man9/bus_generic_new_pass.9#2 (text+ko) ==== @@ -25,10 +25,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bus_generic_new_pass.9,v 1.1 2009/06/09 14:26:23 jhb Exp $ +.\" $FreeBSD: src/share/man/man9/bus_generic_new_pass.9,v 1.2 2010/06/11 06:03:47 uqs Exp $ .\" .Dd June 8, 2009 -.Dt bus_generic_new_pass 9 +.Dt BUS_GENERIC_NEW_PASS 9 .Os .Sh NAME .Nm bus_generic_new_pass ==== //depot/projects/smpng/share/man/man9/bus_set_pass.9#2 (text+ko) ==== @@ -25,10 +25,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bus_set_pass.9,v 1.1 2009/06/09 14:26:23 jhb Exp $ +.\" $FreeBSD: src/share/man/man9/bus_set_pass.9,v 1.2 2010/06/11 06:03:47 uqs Exp $ .\" .Dd June 8, 2009 -.Dt bus_set_pass 9 +.Dt BUS_SET_PASS 9 .Os .Sh NAME .Nm bus_set_pass ==== //depot/projects/smpng/share/man/man9/insmntque.9#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/insmntque.9,v 1.4 2009/01/08 21:29:40 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/insmntque.9,v 1.5 2010/06/11 06:03:47 uqs Exp $ .\" .Dd September 8, 2008 -.Dt insmntque 9 +.Dt INSMNTQUE 9 .Os .Sh NAME .Nm insmntque , ==== //depot/projects/smpng/share/man/man9/vfs_busy.9#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vfs_busy.9,v 1.9 2008/11/02 10:33:57 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/vfs_busy.9,v 1.10 2010/06/14 17:31:46 jh Exp $ .\" -.Dd November 2, 2008 +.Dd June 14, 2010 .Dt VFS_BUSY 9 .Os .Sh NAME @@ -40,9 +40,8 @@ .Sh DESCRIPTION The .Fn vfs_busy -function marks a mount point as busy. -The purpose of this -function is to synchronize access to a mount point. +function marks a mount point as busy by incrementing +the reference count of a mount point. It also delays unmounting by sleeping on .Fa mp if the @@ -50,7 +49,7 @@ flag is set in .Fa mp->mnt_kern_flag and the -.Dv LK_NOWAIT +.Dv MBF_NOWAIT flag is .Em not set. @@ -75,9 +74,9 @@ .Sh RETURN VALUES A 0 value is returned on success. If the mount point is being -unmounted +unmounted and MBF_NOWAIT flag is specified .Er ENOENT -will always be returned. +will be returned. .Sh ERRORS .Bl -tag -width Er .It Bq Er ENOENT ==== //depot/projects/smpng/share/man/man9/vfs_mountedfrom.9#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vfs_mountedfrom.9,v 1.2 2008/02/26 23:16:23 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/vfs_mountedfrom.9,v 1.3 2010/06/11 06:03:47 uqs Exp $ .\" .Dd February 25, 2008 -.Dt vfs_mountedfrom 9 +.Dt VFS_MOUNTEDFROM 9 .Os .Sh NAME .Nm vfs_mountedfrom ==== //depot/projects/smpng/share/man/man9/vfs_unbusy.9#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vfs_unbusy.9,v 1.10 2008/08/31 14:26:08 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/vfs_unbusy.9,v 1.11 2010/06/14 17:31:46 jh Exp $ .\" -.Dd August 29, 2008 +.Dd June 14, 2010 .Dt VFS_UNBUSY 9 .Os .Sh NAME @@ -40,23 +40,17 @@ .Sh DESCRIPTION The .Fn vfs_unbusy -function un-busies a mount point by unlocking -.Fa mp->mnt_lock . -The lock is typically acquired by calling +function un-busies a mount point by decrementing +the reference count of a mount point. +The reference count is typically incremented by calling .Xr vfs_busy 9 prior to this call. .Pp Its arguments are: .Bl -tag -width ".Fa mp" .It Fa mp -The mount point to unbusy (unlock). +The mount point to unbusy. .El -.Sh LOCKS -.Va mnt_lock -must be locked in -.Fa mp -prior to calling -this function, and it will be unlocked upon return. .Sh SEE ALSO .Xr vfs_busy 9 .Sh AUTHORS ==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.29 2010/06/05 15:59:59 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.31 2010/06/15 18:51:41 jhb Exp $"); #include #include @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -245,7 +246,7 @@ cr3 = rcr3(); load_cr3(KPML4phys); - stopfpu = stopxpcbs[0]->xpcb_pcb.pcb_save; + stopfpu = &stopxpcbs[0]->xpcb_pcb.pcb_user_save; if (acpi_savecpu(stopxpcbs[0])) { fpugetregs(curthread, stopfpu); @@ -300,6 +301,7 @@ #endif load_cr3(cr3); + mca_resume(); intr_resume(); intr_restore(rf); ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#20 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.29 2009/09/23 15:42:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.30 2010/06/11 18:46:34 jhb Exp $"); #include #include @@ -557,9 +557,7 @@ if (madt == NULL) return; - for (i = 0; i < MAXCPU; i++) { - if (CPU_ABSENT(i)) - continue; + CPU_FOREACH(i) { pc = pcpu_find(i); KASSERT(pc != NULL, ("no pcpu data for CPU %u", i)); la = &lapics[pc->pc_apic_id]; ==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#20 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.116 2010/05/24 15:45:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.117 2010/06/17 11:54:49 mav Exp $ */ /* @@ -36,6 +36,8 @@ * as well as IPI handlers. */ +#include "opt_smp.h" + #include #include @@ -135,6 +137,19 @@ .text SUPERALIGN_TEXT IDTVEC(invltlb) +#if defined(COUNT_XINVLTLB_HITS) || defined(COUNT_IPIS) + PUSH_FRAME + movl PCPU(CPUID), %eax +#ifdef COUNT_XINVLTLB_HITS + incl xhits_gbl(,%rax,4) +#endif +#ifdef COUNT_IPIS + movq ipi_invltlb_counts(,%rax,8),%rax + incq (%rax) +#endif + POP_FRAME +#endif + pushq %rax movq %cr3, %rax /* invalidate the TLB */ @@ -155,6 +170,19 @@ .text SUPERALIGN_TEXT IDTVEC(invlpg) +#if defined(COUNT_XINVLTLB_HITS) || defined(COUNT_IPIS) + PUSH_FRAME + movl PCPU(CPUID), %eax +#ifdef COUNT_XINVLTLB_HITS + incl xhits_pg(,%rax,4) +#endif +#ifdef COUNT_IPIS + movq ipi_invlpg_counts(,%rax,8),%rax + incq (%rax) +#endif + POP_FRAME +#endif + pushq %rax movq smp_tlb_addr1, %rax @@ -175,6 +203,19 @@ .text SUPERALIGN_TEXT IDTVEC(invlrng) +#if defined(COUNT_XINVLTLB_HITS) || defined(COUNT_IPIS) + PUSH_FRAME + movl PCPU(CPUID), %eax +#ifdef COUNT_XINVLTLB_HITS + incl xhits_rng(,%rax,4) +#endif +#ifdef COUNT_IPIS + movq ipi_invlrng_counts(,%rax,8),%rax + incq (%rax) +#endif + POP_FRAME +#endif + pushq %rax pushq %rdx @@ -201,6 +242,14 @@ .text SUPERALIGN_TEXT IDTVEC(invlcache) +#ifdef COUNT_IPIS + PUSH_FRAME + movl PCPU(CPUID), %eax + movq ipi_invlcache_counts(,%rax,8),%rax + incq (%rax) + POP_FRAME +#endif + pushq %rax wbinvd @@ -270,6 +319,11 @@ SUPERALIGN_TEXT IDTVEC(rendezvous) PUSH_FRAME +#ifdef COUNT_IPIS + movl PCPU(CPUID), %eax + movq ipi_rendezvous_counts(,%rax,8), %rax + incq (%rax) +#endif call smp_rendezvous_action movq lapic, %rax movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ ==== //depot/projects/smpng/sys/amd64/amd64/exception.S#29 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.146 2010/05/12 10:29:35 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.147 2010/06/23 20:44:07 kib Exp $ */ #include "opt_atpic.h" @@ -191,6 +191,7 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) + cld FAKE_MCOUNT(TF_RIP(%rsp)) #ifdef KDTRACE_HOOKS /* @@ -270,6 +271,7 @@ movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) + cld testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs @@ -369,6 +371,7 @@ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ movl $TF_HASSEGS,TF_FLAGS(%rsp) + cld FAKE_MCOUNT(TF_RIP(%rsp)) movq %rsp,%rdi call syscall @@ -434,6 +437,7 @@ movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) + cld xorl %ebx,%ebx testb $SEL_RPL_MASK,TF_CS(%rsp) jnz nmi_fromuserspace ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.167 2010/06/06 16:13:50 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.169 2010/06/15 14:59:35 kib Exp $"); #include #include @@ -115,6 +115,9 @@ u_int mxcsr; u_short control; + /* + * It is too early for critical_enter() to work on AP. + */ savecrit = intr_disable(); stop_emulating(); fninit(); @@ -141,16 +144,15 @@ void fpuexit(struct thread *td) { - register_t savecrit; - savecrit = intr_disable(); + critical_enter(); if (curthread == PCPU_GET(fpcurthread)) { stop_emulating(); fxsave(PCPU_GET(curpcb)->pcb_save); start_emulating(); PCPU_SET(fpcurthread, 0); } - intr_restore(savecrit); + critical_exit(); } int @@ -351,10 +353,9 @@ int fputrap() { - register_t savecrit; u_short control, status; - savecrit = intr_disable(); + critical_enter(); /* * Interrupt handling (for another interrupt) may have pushed the @@ -371,7 +372,7 @@ if (PCPU_GET(fpcurthread) == curthread) fnclex(); - intr_restore(savecrit); + critical_exit(); return (fpetable[status & ((~control & 0x3f) | 0x40)]); } @@ -389,12 +390,13 @@ fpudna(void) { struct pcb *pcb; - register_t s; + critical_enter(); if (PCPU_GET(fpcurthread) == curthread) { printf("fpudna: fpcurthread == curthread %d times\n", ++err_count); stop_emulating(); + critical_exit(); return; } if (PCPU_GET(fpcurthread) != NULL) { @@ -404,7 +406,6 @@ curthread, curthread->td_proc->p_pid); panic("fpudna"); } - s = intr_disable(); stop_emulating(); /* * Record new context early in case frstor causes a trap. @@ -428,19 +429,17 @@ pcb->pcb_flags |= PCB_USERFPUINITDONE; } else fxrstor(pcb->pcb_save); - intr_restore(s); + critical_exit(); } -/* - * This should be called with interrupts disabled and only when the owning - * FPU thread is non-null. - */ void fpudrop() { struct thread *td; td = PCPU_GET(fpcurthread); + KASSERT(td == curthread, ("fpudrop: fpcurthread != curthread")); + CRITICAL_ASSERT(td); PCPU_SET(fpcurthread, NULL); td->td_pcb->pcb_flags &= ~PCB_FPUINITDONE; start_emulating(); @@ -454,7 +453,6 @@ fpugetuserregs(struct thread *td, struct savefpu *addr) { struct pcb *pcb; - register_t s; pcb = td->td_pcb; if ((pcb->pcb_flags & PCB_USERFPUINITDONE) == 0) { @@ -462,13 +460,13 @@ addr->sv_env.en_cw = pcb->pcb_initial_fpucw; return (_MC_FPOWNED_NONE); } - s = intr_disable(); + critical_enter(); if (td == PCPU_GET(fpcurthread) && PCB_USER_FPU(pcb)) { fxsave(addr); - intr_restore(s); + critical_exit(); return (_MC_FPOWNED_FPU); } else { - intr_restore(s); + critical_exit(); bcopy(&pcb->pcb_user_save, addr, sizeof(*addr)); return (_MC_FPOWNED_PCB); } @@ -478,7 +476,6 @@ fpugetregs(struct thread *td, struct savefpu *addr) { struct pcb *pcb; - register_t s; pcb = td->td_pcb; if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { @@ -486,13 +483,13 @@ addr->sv_env.en_cw = pcb->pcb_initial_fpucw; return (_MC_FPOWNED_NONE); } - s = intr_disable(); + critical_enter(); if (td == PCPU_GET(fpcurthread)) { fxsave(addr); - intr_restore(s); + critical_exit(); return (_MC_FPOWNED_FPU); } else { - intr_restore(s); + critical_exit(); bcopy(pcb->pcb_save, addr, sizeof(*addr)); return (_MC_FPOWNED_PCB); } @@ -505,16 +502,15 @@ fpusetuserregs(struct thread *td, struct savefpu *addr) { struct pcb *pcb; - register_t s; pcb = td->td_pcb; - s = intr_disable(); + critical_enter(); if (td == PCPU_GET(fpcurthread) && PCB_USER_FPU(pcb)) { fxrstor(addr); - intr_restore(s); + critical_exit(); pcb->pcb_flags |= PCB_FPUINITDONE | PCB_USERFPUINITDONE; } else { - intr_restore(s); + critical_exit(); bcopy(addr, &td->td_pcb->pcb_user_save, sizeof(*addr)); if (PCB_USER_FPU(pcb)) pcb->pcb_flags |= PCB_FPUINITDONE; @@ -526,15 +522,14 @@ fpusetregs(struct thread *td, struct savefpu *addr) { struct pcb *pcb; - register_t s; pcb = td->td_pcb; - s = intr_disable(); + critical_enter(); if (td == PCPU_GET(fpcurthread)) { fxrstor(addr); - intr_restore(s); + critical_exit(); } else { - intr_restore(s); + critical_exit(); bcopy(addr, td->td_pcb->pcb_save, sizeof(*addr)); } if (PCB_USER_FPU(pcb)) @@ -652,13 +647,12 @@ fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx) { struct pcb *pcb; - register_t savecrit; pcb = td->td_pcb; - savecrit = intr_disable(); + critical_enter(); if (curthread == PCPU_GET(fpcurthread)) fpudrop(); - intr_restore(savecrit); + critical_exit(); pcb->pcb_save = ctx->prev; if (pcb->pcb_save == &pcb->pcb_user_save) { if ((pcb->pcb_flags & PCB_USERFPUINITDONE) != 0) ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#39 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.48 2010/02/25 14:13:39 attilio Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.49 2010/06/14 07:38:53 mav Exp $ */ /* @@ -529,7 +529,7 @@ */ if (isrc->is_event->ie_cpu != NOCPU) (void)isrc->is_pic->pic_assign_cpu(isrc, - isrc->is_event->ie_cpu); + cpu_apic_ids[isrc->is_event->ie_cpu]); else if (isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[current_cpu]) == 0) (void)intr_next_cpu(); ==== //depot/projects/smpng/sys/amd64/amd64/legacy.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.63 2008/03/13 20:39:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.64 2010/06/11 18:46:34 jhb Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -269,12 +269,11 @@ * so that these devices are attached after the Host-PCI * bridges (which are added at order 100). */ - for (i = 0; i <= mp_maxid; i++) - if (!CPU_ABSENT(i)) { - child = BUS_ADD_CHILD(parent, 150, "cpu", i); - if (child == NULL) - panic("legacy_attach cpu"); - } + CPU_FOREACH(i) { + child = BUS_ADD_CHILD(parent, 150, "cpu", i); + if (child == NULL) + panic("legacy_attach cpu"); + } } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 25 20:29:40 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F4491065677; Fri, 25 Jun 2010 20:29:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D82851065670 for ; Fri, 25 Jun 2010 20:29:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C55FF8FC23 for ; Fri, 25 Jun 2010 20:29:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5PKTdxO061310 for ; Fri, 25 Jun 2010 20:29:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5PKTdis061308 for perforce@freebsd.org; Fri, 25 Jun 2010 20:29:39 GMT (envelope-from jhb@freebsd.org) Date: Fri, 25 Jun 2010 20:29:39 GMT Message-Id: <201006252029.o5PKTdis061308@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 20:29:40 -0000 http://p4web.freebsd.org/@@180223?ac=10 Change 180223 by jhb@jhb_jhbbsd on 2010/06/25 20:29:17 Fix merge-o. Affected files ... .. //depot/projects/smpng/sys/arm/include/bootinfo.h#3 edit Differences ... ==== //depot/projects/smpng/sys/arm/include/bootinfo.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/bootinfo.h,v 1.1 2008/10/14 10:11:14 raj Exp $ + * $FreeBSD: src/sys/arm/include/bootinfo.h,v 1.3 2010/06/14 16:05:21 raj Exp $ */ #ifndef _MACHINE_BOOTINFO_H_ From owner-p4-projects@FreeBSD.ORG Fri Jun 25 20:29:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD2361065763; Fri, 25 Jun 2010 20:29:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04A3C1065673 for ; Fri, 25 Jun 2010 20:29:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E60A38FC24 for ; Fri, 25 Jun 2010 20:29:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5PKTdp6061315 for ; Fri, 25 Jun 2010 20:29:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5PKTdwm061313 for perforce@freebsd.org; Fri, 25 Jun 2010 20:29:39 GMT (envelope-from jhb@freebsd.org) Date: Fri, 25 Jun 2010 20:29:39 GMT Message-Id: <201006252029.o5PKTdwm061313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 20:29:41 -0000 http://p4web.freebsd.org/@@180224?ac=10 Change 180224 by jhb@jhb_jhbbsd on 2010/06/25 20:29:38 Drop this local change. Affected files ... .. //depot/projects/smpng/sys/i386/isa/npx.c#69 edit Differences ... ==== //depot/projects/smpng/sys/i386/isa/npx.c#69 (text+ko) ==== @@ -377,9 +377,8 @@ { critical_enter(); - if (td == PCPU_GET(fpcurthread)) - /* XXX: npxdrop() instead? */ - npxsave(&td->td_pcb->pcb_save); + if (curthread == PCPU_GET(fpcurthread)) + npxsave(PCPU_GET(curpcb)->pcb_save); critical_exit(); #ifdef NPX_DEBUG if (hw_float) { From owner-p4-projects@FreeBSD.ORG Fri Jun 25 22:05:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7161E1065674; Fri, 25 Jun 2010 22:05:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35FCF106566B for ; Fri, 25 Jun 2010 22:05:33 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22E908FC24 for ; Fri, 25 Jun 2010 22:05:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5PM5XMf081227 for ; Fri, 25 Jun 2010 22:05:33 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5PM5Xrf081225 for perforce@freebsd.org; Fri, 25 Jun 2010 22:05:33 GMT (envelope-from gpf@FreeBSD.org) Date: Fri, 25 Jun 2010 22:05:33 GMT Message-Id: <201006252205.o5PM5Xrf081225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 22:05:33 -0000 http://p4web.freebsd.org/@@180226?ac=10 Change 180226 by gpf@gpf_desktop on 2010/06/25 22:05:24 - audit paths for mknod rpc Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#7 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#7 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdport.c#7 (text+ko) ==== @@ -837,6 +837,7 @@ error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); + nfsrv_auditpath(NULL, ndp->ni_dvp, ndp->ni_cnd.cn_pnbuf, NULL, 1); nfsvno_relpathbuf(ndp); } else { if (nvap->na_type != VFIFO && @@ -849,6 +850,7 @@ error = VOP_MKNOD(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); vput(ndp->ni_dvp); + nfsrv_auditpath(NULL, ndp->ni_dvp, ndp->ni_cnd.cn_pnbuf, NULL, 1); nfsvno_relpathbuf(ndp); if (error) vrele(ndp->ni_startdir); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#7 (text+ko) ==== @@ -446,7 +446,8 @@ error = (*(nfsrv3_procs1[nd->nd_procnum]))(nd, isdgram, vp, &AUDIT_vp, (fhandle_t *)fh.nfsrvfh_data, p, &nes); if (AUDIT_vp != NULL) { - nfsrv_auditpath(AUDIT_vp, NULL, NULL, + if (nd->nd_procnum != NFSPROC_MKNOD) + nfsrv_auditpath(AUDIT_vp, NULL, NULL, (fhandle_t *)fh.nfsrvfh_data, 1); vrele(AUDIT_vp); } From owner-p4-projects@FreeBSD.ORG Sat Jun 26 06:36:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F2271065672; Sat, 26 Jun 2010 06:36:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23324106566C for ; Sat, 26 Jun 2010 06:36:54 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0EE568FC13 for ; Sat, 26 Jun 2010 06:36:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5Q6arwg053721 for ; Sat, 26 Jun 2010 06:36:53 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5Q6armL053719 for perforce@freebsd.org; Sat, 26 Jun 2010 06:36:53 GMT (envelope-from trasz@freebsd.org) Date: Sat, 26 Jun 2010 06:36:53 GMT Message-Id: <201006260636.o5Q6armL053719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2010 06:36:54 -0000 http://p4web.freebsd.org/@@180232?ac=10 Change 180232 by trasz@trasz_victim on 2010/06/26 06:36:08 s/hrl_container/container/g Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#2 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#75 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#21 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#17 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#32 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#2 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#44 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#15 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#8 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#21 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#18 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ extern struct mtx hrl_lock; static void -hrl_container_add(struct hrl_container *dest, const struct hrl_container *src) +container_add(struct container *dest, const struct container *src) { int i; @@ -73,7 +73,7 @@ } static void -hrl_container_subtract(struct hrl_container *dest, const struct hrl_container *src) +container_subtract(struct container *dest, const struct container *src) { int i; @@ -93,7 +93,7 @@ } void -hrl_container_join(struct hrl_container *child, struct hrl_container *parent) +container_join(struct container *child, struct container *parent) { int i; @@ -106,7 +106,7 @@ ("container already joined")); if (child->hc_parents[i] == NULL) { child->hc_parents[i] = parent; - hrl_container_add(parent, child); + container_add(parent, child); return; } } @@ -114,7 +114,7 @@ } void -hrl_container_leave(struct hrl_container *child, struct hrl_container *parent) +container_leave(struct container *child, struct container *parent) { int i; @@ -124,7 +124,7 @@ for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { if (child->hc_parents[i] == parent) { - hrl_container_subtract(parent, child); + container_subtract(parent, child); child->hc_parents[i] = NULL; return; } @@ -133,7 +133,7 @@ } static void -hrl_container_leave_parents(struct hrl_container *child) +container_leave_parents(struct container *child) { int i; @@ -143,13 +143,13 @@ for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { if (child->hc_parents[i] == NULL) continue; - hrl_container_subtract(child->hc_parents[i], child); + container_subtract(child->hc_parents[i], child); child->hc_parents[i] = NULL; } } void -hrl_container_create(struct hrl_container *container) +container_create(struct container *container) { int i; @@ -162,7 +162,7 @@ } void -hrl_container_destroy(struct hrl_container *container) +container_destroy(struct container *container) { int i; @@ -176,7 +176,7 @@ container->hc_resources[i] = 0; } - hrl_container_leave_parents(container); + container_leave_parents(container); mtx_unlock(&hrl_lock); } @@ -185,10 +185,10 @@ * Go through the resource consumption information and make sure it makes sense. */ static void -hrl_container_assert(const struct hrl_container *container) +container_assert(const struct container *container) { int i, resource; - struct hrl_container *parent; + struct container *parent; mtx_assert(&hrl_lock, MA_OWNED); KASSERT(container != NULL, ("NULL container")); @@ -202,7 +202,7 @@ parent = container->hc_parents[i]; if (parent == NULL); continue; - hrl_container_assert(parent); + container_assert(parent); for (resource = 0; resource <= HRL_RESOURCE_MAX; resource++) { KASSERT(parent->hc_resources[resource] >= container->hc_resources[resource], @@ -218,7 +218,7 @@ * may be less than zero. */ static void -hrl_container_alloc_resource(struct hrl_container *container, int resource, +container_alloc_resource(struct container *container, int resource, uint64_t amount) { int i; @@ -230,10 +230,10 @@ for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { if (container->hc_parents[i] == NULL) continue; - hrl_container_alloc_resource(container->hc_parents[i], resource, amount); + container_alloc_resource(container->hc_parents[i], resource, amount); } #ifdef DIAGNOSTIC - hrl_container_assert(container); + container_assert(container); #endif } @@ -259,7 +259,7 @@ mtx_unlock(&hrl_lock); return (error); } - hrl_container_alloc_resource(&p->p_container, resource, amount); + container_alloc_resource(&p->p_container, resource, amount); mtx_unlock(&hrl_lock); return (0); @@ -294,7 +294,7 @@ return (error); } } - hrl_container_alloc_resource(&p->p_container, resource, diff); + container_alloc_resource(&p->p_container, resource, diff); mtx_unlock(&hrl_lock); return (0); @@ -320,6 +320,6 @@ "%ld for %s (pid %d)", amount, hrl_resource_name(resource), p->p_container.hc_resources[resource], p->p_comm, p->p_pid)); - hrl_container_alloc_resource(&p->p_container, resource, -amount); + container_alloc_resource(&p->p_container, resource, -amount); mtx_unlock(&hrl_lock); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#75 (text+ko) ==== @@ -511,7 +511,7 @@ * Connect the rule to the container, increasing refcount for the rule. */ static void -hrl_container_add_rule(struct hrl_container *container, struct hrl_rule *rule) +hrl_container_add_rule(struct container *container, struct hrl_rule *rule) { struct hrl_rule_link *link; @@ -527,7 +527,7 @@ } static int -hrl_container_add_rule_locked(struct hrl_container *container, struct hrl_rule *rule) +hrl_container_add_rule_locked(struct container *container, struct hrl_rule *rule) { struct hrl_rule_link *link; @@ -550,7 +550,7 @@ * the number of limit structures removed. */ static int -hrl_container_remove_rules(struct hrl_container *container, +hrl_container_remove_rules(struct container *container, const struct hrl_rule *filter) { int removed = 0; @@ -972,7 +972,7 @@ } static int -hrl_rule_remove_callback(struct hrl_container *container, const struct hrl_rule *filter, void *arg3) +hrl_rule_remove_callback(struct container *container, const struct hrl_rule *filter, void *arg3) { int *found = (int *)arg3; @@ -1121,7 +1121,7 @@ } static struct sbuf * -hrl_container_to_sbuf(struct hrl_container *container) +hrl_container_to_sbuf(struct container *container) { int i; struct sbuf *sb; @@ -1216,7 +1216,7 @@ } static int -hrl_get_rules_callback(struct hrl_container *container, +hrl_get_rules_callback(struct container *container, const struct hrl_rule *filter, void *arg3) { struct hrl_rule_link *link; @@ -1457,10 +1457,10 @@ mtx_lock(&hrl_lock); - hrl_container_create(&p->p_container); - hrl_container_join(&p->p_container, &cred->cr_ruidinfo->ui_container); - hrl_container_join(&p->p_container, &cred->cr_loginclass->lc_container); - hrl_container_join(&p->p_container, &cred->cr_prison->pr_container); + container_create(&p->p_container); + container_join(&p->p_container, &cred->cr_ruidinfo->ui_container); + container_join(&p->p_container, &cred->cr_loginclass->lc_container); + container_join(&p->p_container, &cred->cr_prison->pr_container); mtx_unlock(&hrl_lock); } @@ -1527,8 +1527,8 @@ KASSERT(error == 0, ("XXX: better error handling needed")); } - hrl_container_leave(&p->p_container, &olduip->ui_container); - hrl_container_join(&p->p_container, &newuip->ui_container); + container_leave(&p->p_container, &olduip->ui_container); + container_join(&p->p_container, &newuip->ui_container); } if (newlc != oldlc) { LIST_FOREACH(link, &newlc->lc_container.hc_rule_links, hrl_next) { @@ -1536,8 +1536,8 @@ KASSERT(error == 0, ("XXX: better error handling needed")); } - hrl_container_leave(&p->p_container, &oldlc->lc_container); - hrl_container_join(&p->p_container, &newlc->lc_container); + container_leave(&p->p_container, &oldlc->lc_container); + container_join(&p->p_container, &newlc->lc_container); } if (newpr != oldpr) { LIST_FOREACH(link, &newpr->pr_container.hc_rule_links, hrl_next) { @@ -1545,8 +1545,8 @@ KASSERT(error == 0, ("XXX: better error handling needed")); } - hrl_container_leave(&p->p_container, &oldpr->pr_container); - hrl_container_join(&p->p_container, &newpr->pr_container); + container_leave(&p->p_container, &oldpr->pr_container); + container_join(&p->p_container, &newpr->pr_container); } mtx_unlock(&hrl_lock); @@ -1563,7 +1563,7 @@ int error, i; struct hrl_rule_link *link; struct hrl_rule *rule; - struct hrl_container *container; + struct container *container; PROC_LOCK(parent); PROC_LOCK(child); @@ -1573,12 +1573,12 @@ * Create container for the child process and inherit containing * containers from the parent. */ - hrl_container_create(&child->p_container); + container_create(&child->p_container); for (i = 0; i <= HRL_HC_PARENTS_MAX; i++) { container = parent->p_container.hc_parents[i]; if (container == NULL) continue; - hrl_container_join(&child->p_container, container); + container_join(&child->p_container, container); } for (i = 0; i <= HRL_RESOURCE_MAX; i++) { @@ -1625,7 +1625,7 @@ hrl_allocated(p, HRL_RESOURCE_PTY, 0); mtx_lock(&hrl_lock); - hrl_container_destroy(&p->p_container); + container_destroy(&p->p_container); mtx_unlock(&hrl_lock); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#21 (text+ko) ==== @@ -1185,7 +1185,7 @@ root = mypr->pr_root; vref(root); } - hrl_container_create(&pr->pr_container); + container_create(&pr->pr_container); strlcpy(pr->pr_hostuuid, DEFAULT_HOSTUUID, HOSTUUIDLEN); pr->pr_flags |= PR_HOST; #if defined(INET) || defined(INET6) @@ -2518,7 +2518,7 @@ if (pr->pr_cpuset != NULL) cpuset_rel(pr->pr_cpuset); osd_jail_exit(pr); - hrl_container_destroy(&pr->pr_container); + container_destroy(&pr->pr_container); free(pr, M_PRISON); /* Removing a prison frees a reference on its parent. */ ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#17 (text+ko) ==== @@ -86,7 +86,7 @@ mtx_lock(&loginclasses_lock); if (refcount_release(&lc->lc_refcount)) { - hrl_container_destroy(&lc->lc_container); + container_destroy(&lc->lc_container); LIST_REMOVE(lc, lc_next); mtx_unlock(&loginclasses_lock); free(lc, M_LOGINCLASS); @@ -126,7 +126,7 @@ } /* Add new loginclass. */ - hrl_container_create(&newlc->lc_container); + container_create(&newlc->lc_container); strcpy(newlc->lc_name, name); refcount_init(&newlc->lc_refcount, 1); LIST_INSERT_HEAD(&loginclasses, newlc, lc_next); @@ -208,7 +208,7 @@ } int -loginclass_container_foreach(int (*callback)(struct hrl_container *container, +loginclass_container_foreach(int (*callback)(struct container *container, const struct hrl_rule *filter, void *arg3), const struct hrl_rule *filter, void *arg3) { ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#32 (text+ko) ==== @@ -1338,7 +1338,7 @@ mtx_init(&uip->ui_vmsize_mtx, "ui_vmsize", NULL, MTX_DEF); LIST_INSERT_HEAD(UIHASH(uid), uip, ui_hash); - hrl_container_create(&uip->ui_container); + container_create(&uip->ui_container); } } uihold(uip); @@ -1386,7 +1386,7 @@ /* Prepare for suboptimal case. */ rw_wlock(&uihashtbl_lock); if (refcount_release(&uip->ui_ref)) { - hrl_container_destroy(&uip->ui_container); + container_destroy(&uip->ui_container); LIST_REMOVE(uip, ui_hash); rw_wunlock(&uihashtbl_lock); if (uip->ui_sbsize != 0) @@ -1410,7 +1410,7 @@ } int -ui_container_foreach(int (*callback)(struct hrl_container *container, +ui_container_foreach(int (*callback)(struct container *container, const struct hrl_rule *filter, void *arg3), const struct hrl_rule *filter, void *arg3) { @@ -1544,7 +1544,7 @@ /* Prepare for suboptimal case. */ rw_wlock(&gihashtbl_lock); if (refcount_release(&gip->gi_ref)) { - hrl_container_destroy(&gip->gi_container); + container_destroy(&gip->gi_container); LIST_REMOVE(gip, gi_hash); rw_wunlock(&gihashtbl_lock); free(gip, M_GIDINFO); @@ -1558,7 +1558,7 @@ } int -gi_container_foreach(int (*callback)(struct hrl_container *container, +gi_container_foreach(int (*callback)(struct container *container, const struct hrl_rule *filter, void *arg3), const struct hrl_rule *filter, void *arg3) { ==== //depot/projects/soc2009/trasz_limits/sys/sys/container.h#2 (text+ko) ==== @@ -66,7 +66,7 @@ /* - * 'hrl_container' defines resource consumption for a particular + * 'container' defines resource consumption for a particular * subject, such as process or jail. Containers form a graph - each * container has zero or more subcontainers and zero or more * "containing" containers (parents). For example, container for @@ -84,9 +84,9 @@ * * This structure must be filled with zeroes initially. */ -struct hrl_container { +struct container { int64_t hc_resources[HRL_RESOURCE_MAX + 1]; - struct hrl_container *hc_parents[HRL_HC_PARENTS_MAX + 1]; + struct container *hc_parents[HRL_HC_PARENTS_MAX + 1]; LIST_HEAD(, hrl_rule_link) hc_rule_links; }; @@ -96,11 +96,11 @@ int hrl_allocated(struct proc *p, int object, uint64_t amount); void hrl_free(struct proc *p, int object, uint64_t amount); -void hrl_container_create(struct hrl_container *container); -void hrl_container_destroy(struct hrl_container *container); +void container_create(struct container *container); +void container_destroy(struct container *container); -void hrl_container_join(struct hrl_container *child, struct hrl_container *parent); -void hrl_container_leave(struct hrl_container *child, struct hrl_container *parent); +void container_join(struct container *child, struct container *parent); +void container_leave(struct container *child, struct container *parent); #endif /* _KERNEL */ ==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#44 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#15 (text+ko) ==== @@ -181,7 +181,7 @@ char pr_hostname[MAXHOSTNAMELEN]; /* (p) jail hostname */ char pr_domainname[MAXHOSTNAMELEN]; /* (p) jail domainname */ char pr_hostuuid[HOSTUUIDLEN]; /* (p) jail hostuuid */ - struct hrl_container pr_container; /* (*) HRL resource accounting */ + struct container pr_container; /* (*) resource accounting */ }; #endif /* _KERNEL || _WANT_PRISON */ ==== //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#8 (text+ko) ==== @@ -36,13 +36,13 @@ LIST_ENTRY(loginclass) lc_next; char lc_name[MAXLOGNAME]; u_int lc_refcount; - struct hrl_container lc_container; + struct container lc_container; }; void loginclass_acquire(struct loginclass *lc); void loginclass_release(struct loginclass *lc); struct loginclass *loginclass_find(const char *name); -int loginclass_container_foreach(int (*callback)(struct hrl_container *container, +int loginclass_container_foreach(int (*callback)(struct container *container, const struct hrl_rule *filter, void *arg3), const struct hrl_rule *filter, void *arg3); ==== //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#21 (text+ko) ==== @@ -523,7 +523,7 @@ int p_boundary_count;/* (c) Num threads at user boundary */ int p_pendingcnt; /* how many signals are pending */ struct itimers *p_itimers; /* (c) POSIX interval timers. */ - struct hrl_container p_container; /* (*) HRL resource accounting */ + struct container p_container; /* (*) resource usage accounting */ /* End area that is zeroed on creation. */ #define p_endzero p_magic ==== //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#18 (text+ko) ==== @@ -99,7 +99,7 @@ long ui_ptscnt; /* (b) number of pseudo-terminals */ uid_t ui_uid; /* (a) uid */ u_int ui_ref; /* (b) reference count */ - struct hrl_container ui_container; /* (*) HRL resource accounting */ + struct container ui_container; /* (*) resource usage accounting */ }; #define UIDINFO_VMSIZE_LOCK(ui) mtx_lock(&((ui)->ui_vmsize_mtx)) @@ -117,7 +117,7 @@ LIST_ENTRY(gidinfo) gi_hash; /* (c) hash chain of gidinfos */ gid_t gi_gid; /* (a) gid */ u_int gi_ref; /* (b) reference count */ - struct hrl_container gi_container; /* (*) HRL resource accounting */ + struct container gi_container; /* (*) resource usage accounting */ }; struct proc; @@ -156,7 +156,7 @@ void uifree(struct uidinfo *uip); void uihashinit(void); void uihold(struct uidinfo *uip); -int ui_container_foreach(int (*callback)(struct hrl_container *container, +int ui_container_foreach(int (*callback)(struct container *container, const struct hrl_rule *filter, void *arg3), const struct hrl_rule *filter, void *arg3); struct gidinfo @@ -164,7 +164,7 @@ void gifree(struct gidinfo *gip); void gihashinit(void); void gihold(struct gidinfo *gip); -int gi_container_foreach(int (*callback)(struct hrl_container *container, +int gi_container_foreach(int (*callback)(struct container *container, const struct hrl_rule *filter, void *arg3), const struct hrl_rule *filter, void *arg3); From owner-p4-projects@FreeBSD.ORG Sat Jun 26 07:10:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECB971065673; Sat, 26 Jun 2010 07:10:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1242106566C for ; Sat, 26 Jun 2010 07:10:30 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E3868FC17 for ; Sat, 26 Jun 2010 07:10:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5Q7AUOR057126 for ; Sat, 26 Jun 2010 07:10:30 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5Q7AUsA057124 for perforce@freebsd.org; Sat, 26 Jun 2010 07:10:30 GMT (envelope-from lz@FreeBSD.org) Date: Sat, 26 Jun 2010 07:10:30 GMT Message-Id: <201006260710.o5Q7AUsA057124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2010 07:10:31 -0000 http://p4web.freebsd.org/@@180233?ac=10 Change 180233 by lz@gnehzuil-freebsd on 2010/06/26 07:10:18 Modify ext2_vget to adapt ext4 file system. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_dinode.h#3 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#3 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#3 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/inode.h#3 edit Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_dinode.h#3 (text+ko) ==== @@ -63,14 +63,14 @@ struct ext2fs_dinode { u_int16_t e2di_mode; /* 0: IFMT, permissions; see below. */ u_int16_t e2di_uid; /* 2: Owner UID */ - u_int32_t e2di_size; /* 4: Size (in bytes) */ + u_int32_t e2di_size_lo; /* 4: Size (in bytes) */ u_int32_t e2di_atime; /* 8: Access time */ u_int32_t e2di_ctime; /* 12: Create time */ u_int32_t e2di_mtime; /* 16: Modification time */ u_int32_t e2di_dtime; /* 20: Deletion time */ u_int16_t e2di_gid; /* 24: Owner GID */ u_int16_t e2di_nlink; /* 26: File link count */ - u_int32_t e2di_nblock; /* 28: Blocks count */ + u_int32_t e2di_nblock_lo; /* 28: Blocks count */ u_int32_t e2di_flags; /* 32: Status flags (chflags) */ union { struct { @@ -92,6 +92,7 @@ union { struct { u_int16_t e2di_l_blk_high; +#define e2di_nblock_high osd2.linux2.e2di_l_blk_high u_int16_t e2di_l_facl_high; u_int16_t e2di_l_uid_high; u_int16_t e2di_l_gid_high; ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ printf( "User: %5lu Group: %5lu Size: %lu\n", (unsigned long)in->i_uid, (unsigned long)in->i_gid, (unsigned long)in->i_size); - printf( "Links: %3d Blockcount: %d\n", + printf( "Links: %3d Blockcount: %lld\n", in->i_nlink, in->i_blocks); printf( "ctime: 0x%x", in->i_ctime); printf( "atime: 0x%x", in->i_atime); @@ -77,7 +77,7 @@ I can see that this might lead to problems in an undelete. */ ip->i_mode = ei->e2di_nlink ? ei->e2di_mode : 0; - ip->i_size = ei->e2di_size; + ip->i_size = ei->e2di_size_lo; if (S_ISREG(ip->i_mode)) ip->i_size |= ((u_int64_t)ei->e2di_size_high) << 32; ip->i_atime = ei->e2di_atime; @@ -87,7 +87,10 @@ ip->i_flags |= (ei->e2di_flags & EXT2_APPEND) ? SF_APPEND : 0; ip->i_flags |= (ei->e2di_flags & EXT2_IMMUTABLE) ? SF_IMMUTABLE : 0; ip->i_flags |= (ei->e2di_flags & EXT2_NODUMP) ? UF_NODUMP : 0; - ip->i_blocks = ei->e2di_nblock; + if (ip->i_e2fs->e2fs->e2fs_features_incompat & EXT4F_ROCOMPAT_HUGE_FILE) + ip->i_blocks = ((int64_t)(ei->e2di_nblock_high)) << 32 | ei->e2di_nblock_lo; + else + ip->i_blocks = ei->e2di_nblock_lo; ip->i_gen = ei->e2di_gen; ip->i_uid = ei->e2di_uid; ip->i_gid = ei->e2di_gid; @@ -115,7 +118,7 @@ has been deleted, this would correspond to a zero link count */ ei->e2di_dtime = ei->e2di_nlink ? 0 : ip->i_mtime; - ei->e2di_size = ip->i_size; + ei->e2di_size_lo = ip->i_size; if (S_ISREG(ip->i_mode)) ei->e2di_size_high = ip->i_size >> 32; ei->e2di_atime = ip->i_atime; @@ -126,7 +129,7 @@ ei->e2di_flags |= (ip->i_flags & SF_APPEND) ? EXT2_APPEND: 0; ei->e2di_flags |= (ip->i_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE: 0; ei->e2di_flags |= (ip->i_flags & UF_NODUMP) ? EXT2_NODUMP: 0; - ei->e2di_nblock = ip->i_blocks; + ei->e2di_nblock_lo = ip->i_blocks; ei->e2di_gen = ip->i_gen; ei->e2di_uid = ip->i_uid; ei->e2di_gid = ip->i_gid; ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#3 (text+ko) ==== @@ -61,6 +61,8 @@ #include #include #include +#include + static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td); static int ext2_mountfs(struct vnode *, struct mount *); @@ -945,6 +947,7 @@ for(i = used_blocks; i < EXT2_NDIR_BLOCKS; i++) ip->i_db[i] = 0; } + /* ext2_print_inode(ip); */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/inode.h#3 (text+ko) ==== @@ -97,7 +97,7 @@ int32_t i_db[NDADDR]; /* Direct disk blocks. */ int32_t i_ib[NIADDR]; /* Indirect disk blocks. */ u_int32_t i_flags; /* Status flags (chflags). */ - int32_t i_blocks; /* Blocks actually held. */ + int64_t i_blocks; /* Blocks actually held. */ int32_t i_gen; /* Generation number. */ u_int32_t i_uid; /* File owner. */ u_int32_t i_gid; /* File group. */ From owner-p4-projects@FreeBSD.ORG Sat Jun 26 20:12:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D55881065672; Sat, 26 Jun 2010 20:12:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98BEB106564A for ; Sat, 26 Jun 2010 20:12:48 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81FF48FC13 for ; Sat, 26 Jun 2010 20:12:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5QKCmgW067911 for ; Sat, 26 Jun 2010 20:12:48 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5QKClSG067909 for perforce@freebsd.org; Sat, 26 Jun 2010 20:12:47 GMT (envelope-from gcooper@FreeBSD.org) Date: Sat, 26 Jun 2010 20:12:47 GMT Message-Id: <201006262012.o5QKClSG067909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2010 20:12:49 -0000 http://p4web.freebsd.org/@@180254?ac=10 Change 180254 by gcooper@gcooper-bayonetta on 2010/06/26 20:12:41 IFC Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#10 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.mips#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pkill/pkill.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pkill/pkill.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/login.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/namedb/named.root#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#8 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/csu/i386-elf/crt1_s.S#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/mips/sys/brk.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/mips/sys/sbrk.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/nls/ru_RU.KOI8-R.msg#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/scripts/ports-install.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/suj.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/check.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/dir.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/class/part/geom_part.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/class/sched/gsched.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/core/geom.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/core/geom.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/ping/ping.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/examples/perfmon/perfmon.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/Makefile#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/aibs.4#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man7/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man7/c99.7#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/smp.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/x86bios/x86bios.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/NOTES#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files#8 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.amd64#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.i386#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/ldscript.mips.n32#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/options.amd64#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpi_support/atk0110.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_hpet.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fb/vesa.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_bus_subr.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/atpic_vector.s#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/exception.s#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/md_var.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/npx.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/pcb.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/isa/npx.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/isa/rtc.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_clock.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_et.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_module.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_resource.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_sdt.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_sig.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_tc.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_bus.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_fattime.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_lock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_module.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_param.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_trap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_unit.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_witness.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_process.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/systrace_args.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/atheros/ar71xx_wdog.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/conf/XLRN32#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/asm.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/cpu.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/pmap.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/pte.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/setjmp.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/vm.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/vmparam.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/exception.S#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pm_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pmap.c#9 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/stack_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/trap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/vm_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/board.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/board.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/dev/xlr/rge.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/acpi/aibs/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/mqueue/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctputil.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/include/npx.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/nexus.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/interrupt.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/isa.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/ocpbus.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/ocpbus.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/opic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_pcibus.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/cpcht.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/kiic.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorthpci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/diskmbr.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/pcpu.h#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/systm.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/timeet.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#8 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.h#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/cpufreq/est.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/isa/atrtc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/isa/clock.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/x86/local_apic.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/x86/timeevents.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/netrate/tcpp/README#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/netrate/tcpp/parallelism.csh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/netrate/tcpp/runit.pl#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/tinybsd/conf/default/TINYBSD#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/tinybsd/conf/vpn/TINYBSD#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/c99/c99.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/du/du.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/du/du.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/systat/vmstat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ypwhich/ypwhich.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/Makefile#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/cpucontrol/amd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/cpucontrol/intel.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mptutil/mptutil.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-partmanager/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/detect-vmware.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-info.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-list.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/disk-part.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/enable-net.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-components.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-rsync-backups.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/query-langs.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/send-logs.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/setup-ssh-keys.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/test-live.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/test-netup.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-disk.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-localize.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-networking.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-newfs.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-parse.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-unmount.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions-users.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/functions.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/parseconfig.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/backend/startautoinstall.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/avail-langs#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/exclude-from-upgrade#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/licenses/bsd-en.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/licenses/intel-en.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/licenses/nvidia-en.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-disk-list#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-disk-size#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-index#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/doc/help-start-autoinstall#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/README#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pc-autoinstall.conf#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.fbsd-netinstall#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.geli#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.gmirror#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.netinstall#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.restore#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.rsync#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.upgrade#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.zfs#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/misc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sysinstall/sysinstall.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/timed/timed/measure.c#2 integrate Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.653 2010/06/16 16:52:35 raj Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.656 2010/06/24 17:53:25 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -30,9 +30,7 @@ .include -.if ${MACHINE_ARCH} == "mips" -MK_RESCUE=no # not yet -.endif +.include # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to @@ -167,7 +165,7 @@ .if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else -OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} +OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile @@ -1110,10 +1108,10 @@ # all shared libraries for ELF. # _startup_libs= gnu/lib/csu -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) -_startup_libs+= lib/csu/${MACHINE_ARCH}-elf +.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf) +_startup_libs+= lib/csu/${MACHINE_CPUARCH}-elf .else -_startup_libs+= lib/csu/${MACHINE_ARCH} +_startup_libs+= lib/csu/${MACHINE_CPUARCH} .endif _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libc ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.6 2010/03/02 07:20:46 joel Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.7 2010/06/20 08:48:30 brian Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -156,14 +156,16 @@ matches processes not in jail. .It Fl l Long output. -Print the process name in addition to the process ID for each matching +For +.Nm pgrep , +print the process name in addition to the process ID for each matching process. If used in conjunction with .Fl f , print the process ID and the full argument list for each matching process. -This option can only be used with the -.Nm pgrep -command. +For +.Nm pkill , +display the kill command used for each process killed. .It Fl n Select only the newest (most recently started) of the matching processes. .It Fl o ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pkill/pkill.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.10 2010/03/02 07:20:46 joel Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.11 2010/06/20 08:48:30 brian Exp $"); #include #include @@ -128,7 +128,7 @@ { char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q, *pidfile; const char *execf, *coref; - int ancestors, debug_opt; + int ancestors, debug_opt, did_action; int i, ch, bestidx, rv, criteria, pidfromfile, pidfilelock; size_t jsz; int (*action)(const struct kinfo_proc *); @@ -242,8 +242,6 @@ criteria = 1; break; case 'l': - if (!pgrep) - usage(); longfmt = 1; break; case 'n': @@ -530,16 +528,24 @@ /* * Take the appropriate action for each matched process, if any. */ + did_action = 0; for (i = 0, rv = 0, kp = plist; i < nproc; i++, kp++) { if (PSKIP(kp)) continue; if (selected[i]) { + if (longfmt && !pgrep) { + did_action = 1; + printf("kill -%d %d\n", signum, kp->ki_pid); + } if (inverse) continue; } else if (!inverse) continue; rv |= (*action)(kp); } + if (!did_action && !pgrep && longfmt) + fprintf(stderr, + "No matching processes belonging to you were found\n"); exit(rv ? STATUS_MATCH : STATUS_NOMATCH); } @@ -552,7 +558,7 @@ if (pgrep) ustr = "[-LSfilnoqvx] [-d delim]"; else - ustr = "[-signal] [-ILfinovx]"; + ustr = "[-signal] [-ILfilnovx]"; fprintf(stderr, "usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n" ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#5 (text+ko) ==== @@ -36,10 +36,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.81 2010/06/19 10:33:04 jilles Exp $"); #include #include +#include #include "shell.h" #include "parser.h" ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 (text+ko) ==== @@ -45,7 +45,7 @@ #undef input #undef unput #else -/* +/* * Define YY_INPUT for flex since input() can't be re-defined. */ #define YY_INPUT(buf,result,max_size) \ @@ -60,6 +60,19 @@ buf[n] = *yypcb->pcb_strptr++; \ result = n; \ } +/* + * Do not EOF let tokens to be put back. This does not work with flex. + * On the other hand, leaving current buffer in same state it was when + * last EOF was received guarantees that input() will keep returning EOF + * for all subsequent invocations, which is the effect desired. + */ +#undef unput +#define unput(c) \ + do { \ + int _c = c; \ + if (_c != EOF) \ + yyunput(_c, yytext_ptr); \ + } while(0) #endif static int id_or_type(const char *); @@ -811,8 +824,7 @@ longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); } - if (c0 != EOF) - unput(c0); + unput(c0); return (ttok); } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/binutils/doc/readelf.1#2 (text+ko) ==== @@ -247,14 +247,6 @@ .PD Displays the contents of the file's unwind section, if it has one. Only the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. -.IP "\fB\-u\fR" 4 -.IX Item "-u" -.PD 0 -.IP "\fB\-\-unwind\fR" 4 -.IX Item "--unwind" -.PD -Displays the contents of the file's unwind section, if it has one. Only -the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. .IP "\fB\-d\fR" 4 .IX Item "-d" .PD 0 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/login.conf#2 (text+ko) ==== @@ -7,7 +7,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $FreeBSD: src/etc/login.conf,v 1.53 2009/06/23 20:57:27 kib Exp $ +# $FreeBSD: src/etc/login.conf,v 1.54 2010/06/19 09:21:34 brian Exp $ # # Default settings effectively disable resource limits, see the @@ -228,7 +228,7 @@ # # ## -## The dialer class should be used for a dialup PPP/SLIP accounts +## The dialer class should be used for a dialup PPP account ## Welcome messages/news suppressed ## #dialer:\ @@ -247,7 +247,7 @@ # # ## -## Site full-time 24/7 PPP/SLIP connections +## Site full-time 24/7 PPP connection ## - no time accounting, restricted to access via dialin lines ## #site:\ @@ -306,11 +306,6 @@ # :tc=subscriber: # # -#subslip|SLIP Subscriber Accounts:\ -# :tc=dialer:\ -# :tc=subscriber: -# -# #subshell|Shell Subscriber Accounts:\ # :tc=subscriber: # ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.usr.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.345 2010/04/21 12:17:01 avg Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.346 2010/06/24 22:21:47 imp Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -261,6 +261,8 @@ .. nwclient .. + pc-sysinstall + .. perfmon .. pf @@ -1226,6 +1228,20 @@ .. .. .. + pc-sysinstall + backend + .. + backend-partmanager + .. + backend-query + .. + conf + license + .. + .. + doc + .. + .. security .. sendmail ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/namedb/named.root#2 (text+ko) ==== @@ -1,5 +1,5 @@ ; -; $FreeBSD: src/etc/namedb/named.root,v 1.15 2009/12/11 01:06:04 dougb Exp $ +; $FreeBSD: src/etc/namedb/named.root,v 1.16 2010/06/18 08:11:52 dougb Exp $ ; ; This file holds the information on root name servers needed to @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Dec 12, 2008 -; related version of root zone: 2008121200 +; last update: Jun 17, 2010 +; related version of root zone: 2010061700 ; ; formerly NS.INTERNIC.NET ; @@ -63,6 +63,7 @@ ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 ; ; OPERATED BY VERISIGN, INC. ; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/daily/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.17 2008/09/21 22:02:26 sam Exp $ +# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.18 2010/06/17 12:25:47 netchild Exp $ .include @@ -8,7 +8,6 @@ 200.backup-passwd \ 330.news \ 400.status-disks \ - 404.status-zfs \ 405.status-ata-raid \ 406.status-gmirror \ 407.status-graid3 \ @@ -53,4 +52,9 @@ 500.queuerun .endif +.if ${MK_ZFS} != "no" +FILES+= 404.status-zfs \ + 800.scrub-zfs +.endif + .include ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/games/fortune/datfiles/fortunes-o.real#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.36 2010/03/31 18:21:25 uqs Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.37 2010/06/26 07:02:31 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -12433,6 +12433,39 @@ (chorus) -- Crosby, Stills, Nash, "Fair Game" % +Taken from actual police car videos: + +(15) Relax! The handcuffs are tight because they're new. They'll + stretch out after you wear them awhile. +(14) Take your hands off the car and I'll make your birth certificate + a worthless document. +(13) If you run you'll only go to jail tired. +(12) Can you run faster than 1200 feet per second? In case you didn't + know that's the average speed of a 9 mm bullet fired from my gun. +(11) So you don't know how fast you were going. I guess that means I + can write anything I want on the ticket, huh? +(10) Yes, sir, you can talk to the shift supervisor, but I don't think + it will help. Oh, did I mention that I AM the shift supervisor? +(9) Warning? You want a warning? OK, I'm warning you not to do that + again or I'll give you another ticket. +(8) The answer to this last question will determine whether you are + drunk or not. Is Mickey Mouse a cat or a dog? +% +Taken from actual police car videos: + +(7) Fair? You want me to be fair? Listen, fair is a place where you + go to ride on rides, eat cotton candy, and step in monkey poop. +(6) Yeah, we have a quota. Two more tickets and my wife gets a toaster + oven. +(5) No, sir, we don't have quotas anymore. We used to have quotas but + now we're allowed to write as many tickets as we want. +(4) Just how big were those two beers? +(3) In God we trust, all others we run through CPIC/NCIC. +(2) I'm glad to hear the Chief of Police is a good personal friend of + yours. At least you know someone who can post your bail. +(1) You didn't think we gave pretty women tickets? + You're right, we don't -- sign here. +% Taoism: Shit Happens. Confucianism: Confucius say, "Shit Happens". Buddhism: If shit happens, it isn't really shit. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.32 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.33 2010/06/18 11:09:51 kib Exp $ .include MK_SSP= no @@ -17,7 +17,8 @@ CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 CFLAGS+= -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-zero-initialized-in-bss \ - -fno-zero-initialized-in-bss -fno-toplevel-reorder + -fno-zero-initialized-in-bss -fno-toplevel-reorder \ + -fno-asynchronous-unwind-tables -fno-omit-frame-pointer CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh#2 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh,v 1.2 2010/03/04 04:30:16 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh,v 1.3 2010/06/25 05:07:42 jchandra Exp $ . ${srcdir}/emulparams/elf32btsmipn32.sh . ${srcdir}/emulparams/elf_fbsd.sh GENERATE_PIE_SCRIPT=yes +ALIGNMENT=8 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh#2 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh,v 1.2 2010/03/04 04:30:16 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh,v 1.3 2010/06/25 05:07:42 jchandra Exp $ . ${srcdir}/emulparams/elf32ltsmipn32.sh . ${srcdir}/emulparams/elf_fbsd.sh GENERATE_PIE_SCRIPT=yes +ALIGNMENT=8 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.248 2010/06/09 19:57:20 rdivacky Exp $ +# $FreeBSD: src/lib/Makefile,v 1.249 2010/06/21 19:44:29 ed Exp $ .include @@ -146,7 +146,7 @@ _libbsnmp= libbsnmp .endif -.if ${MK_CLANG} != "no" +.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) _clang= clang .endif ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/csu/i386-elf/crt1_s.S#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $ + * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $ */ @@ -30,15 +30,22 @@ .align 4 .globl _start .type _start, @function -_start: xorl %ebp,%ebp +_start: + .cfi_startproc + xorl %ebp,%ebp pushl %ebp + .cfi_def_cfa_offset 4 movl %esp,%ebp + .cfi_offset %ebp,-8 + .cfi_def_cfa_register %ebp andl $0xfffffff0,%esp # align stack leal 8(%ebp),%eax pushl %eax # argv pushl 4(%ebp) # argc pushl %edx # rtld cleanup call _start1 + int3 + .cfi_endproc .size _start, . - _start - .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $" + .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $" ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/mips/sys/brk.S#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.5 2010/06/16 12:55:14 jchandra Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.6 2010/06/25 05:36:36 jchandra Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -47,7 +47,7 @@ .data _C_LABEL(minbrk): - .word _C_LABEL(_end) + PTR_WORD _C_LABEL(_end) .text LEAF(__sys_brk) ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/mips/sys/sbrk.S#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/sbrk.S,v 1.4 2010/06/16 12:55:14 jchandra Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/sbrk.S,v 1.5 2010/06/25 05:36:36 jchandra Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -46,7 +46,7 @@ .data _C_LABEL(__curbrk): - .word _C_LABEL(_end) + PTR_WORD _C_LABEL(_end) .text LEAF(__sys_sbrk) ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/nls/ru_RU.KOI8-R.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.2 2009/03/21 10:10:33 maxim Exp $ +$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.3 2010/06/20 06:52:10 maxim Exp $ $ $ Message catalog for ru_RU.KOI8-R locale $ @@ -183,6 +183,16 @@ 87 Атрибут не найден $ EDOOFUS 88 Ошибка программирования +$ EBADMSG +89 Плохой формат сообщения +$ EMULTIHOP +90 Попытка мультихопа +$ ENOLINK +91 Канал разорван +$ EPROTO +92 Ошибка протокола +$ ENOTCAPABLE +93 Недостаточно возможностей $ $ strsignal() support catalog $ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libkvm/kvm_proc.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.102 2009/12/10 21:16:16 brooks Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.103 2010/06/18 01:17:16 sbruno Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -323,7 +323,12 @@ (void)kvm_read(kd, (u_long)proc.p_vmspace, (char *)&vmspace, sizeof(vmspace)); kp->ki_size = vmspace.vm_map.size; - kp->ki_rssize = vmspace.vm_swrss; /* XXX */ + /* + * Approximate the kernel's method of calculating + * this field. + */ +#define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) + kp->ki_rssize = pmap_resident_count(&vmspace.vm_pmap); kp->ki_swrss = vmspace.vm_swrss; kp->ki_tsize = vmspace.vm_tsize; kp->ki_dsize = vmspace.vm_dsize; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/scripts/ports-install.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/ports-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $ +# $FreeBSD: src/release/scripts/ports-install.sh,v 1.4 2010/06/19 09:33:11 brian Exp $ # if [ "`id -u`" != "0" ]; then @@ -8,5 +8,5 @@ exit 1 fi echo "Extracting ports tarball into ${DESTDIR}/usr" -cat ports.tgz | tar --unlink -xpzf - -C ${DESTDIR}/usr +tar --unlink -xpzf ports.tgz -C ${DESTDIR}/usr exit 0 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/main.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.59 2010/04/24 07:05:35 jeff Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.60 2010/06/22 00:26:07 delphij Exp $"); #include #include @@ -388,16 +388,18 @@ /* * Determine if we can and should do journal recovery. */ - if ((sblock.fs_flags & (FS_SUJ | FS_NEEDSFSCK)) == FS_SUJ) { - if (preen || reply("USE JOURNAL?")) { - if (suj_check(filesys) == 0) { - if (chkdoreload(mntp) == 0) - exit(0); - exit(4); + if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { + if (preen || reply("USE JOURNAL?")) { + if (suj_check(filesys) == 0) { + printf("\n***** FILE SYSTEM MARKED CLEAN *****\n"); + if (chkdoreload(mntp) == 0) + exit(0); + exit(4); + } } - /* suj_check failed, fall through. */ + printf("** Skipping journal, falling through to full fsck\n\n"); } - printf("** Skipping journal, falling through to full fsck\n"); /* * Write the superblock so we don't try to recover the * journal on another pass. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_ffs/suj.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.2 2010/04/24 07:58:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.3 2010/06/22 00:26:07 delphij Exp $"); #include #include @@ -37,12 +37,15 @@ #include #include +#include +#include #include #include #include #include #include #include +#include #include #include @@ -141,7 +144,10 @@ uint64_t jbytes; >>> TRUNCATED FOR MAIL (1000 lines) <<<