Skip to content

X
xv6-public
提交 c01b7d28 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer
浏览文件
操作

Add a stat member to devsw and a sampstat function

上级 1258b4c3
隐藏空白字符变更
内嵌 并排
正在显示 包含 38 行增加 和 39 行删除
file.hh
浏览文件 @ c01b7d28
...@@ -53,6 +53,7 @@ struct inode : public rcu_freed { ...@@ -53,6 +53,7 @@ struct inode : public rcu_freed {
struct devsw { struct devsw {
int (*read)(struct inode*, char*, u32, u32); int (*read)(struct inode*, char*, u32, u32);
int (*write)(struct inode*, char*, u32, u32); int (*write)(struct inode*, char*, u32, u32);
void (*stat)(struct inode*, struct stat*);
}; };
extern struct devsw devsw[]; extern struct devsw devsw[];
......
fs.cc
浏览文件 @ c01b7d28
...@@ -529,6 +529,14 @@ itrunc(struct inode *ip) ...@@ -529,6 +529,14 @@ itrunc(struct inode *ip)
void void
stati(struct inode *ip, struct stat *st) stati(struct inode *ip, struct stat *st)
{ {
if(ip->type == T_DEV){
if(ip->major < 0 || ip->major >= NDEV || !devsw[ip->major].stat)
memset(st, 0, sizeof(*st));
else
devsw[ip->major].stat(ip, st);
return;
}
st->dev = ip->dev; st->dev = ip->dev;
st->ino = ip->inum; st->ino = ip->inum;
st->type = ip->type; st->type = ip->type;
......
perf.cc
浏览文件 @ c01b7d28
...@@ -29,36 +29,6 @@ conf(int fd, sampop_t op) ...@@ -29,36 +29,6 @@ conf(int fd, sampop_t op)
close(fd); close(fd);
} }
static void
save(void)
{
static char buf[4096];
int fd, sfd;
int r;
fd = open("/dev/sampler", O_RDONLY);
if (fd < 0)
die("perf: open failed");
unlink("perf.data");
sfd = open("perf.data", O_RDWR|O_CREATE);
if (sfd < 0)
die("perf: open failed");
while (1) {
r = read(fd, buf, sizeof(buf));
if (r < 0)
die("perf: read failed");
if (r == 0)
break;
if (write(sfd, buf, r) != r)
die("perf: truncated write");
}
close(sfd);
close(fd);
}
int int
main(int ac, const char *av[]) main(int ac, const char *av[])
{ {
...@@ -78,6 +48,5 @@ main(int ac, const char *av[]) ...@@ -78,6 +48,5 @@ main(int ac, const char *av[])
wait(); wait();
conf(fd, SAMP_DISABLE); conf(fd, SAMP_DISABLE);
save();
exit(); exit();
} }
print-perf.c
浏览文件 @ c01b7d28
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
int int
main(int ac, char **av) main(int ac, char **av)
{ {
static const char *pathname = "perf.data"; static const char *pathname = "sampler";
struct logheader *header; struct logheader *header;
struct stat buf; struct stat buf;
void *x; void *x;
......
sampler.cc
浏览文件 @ c01b7d28
...@@ -4,6 +4,7 @@ extern "C" { ...@@ -4,6 +4,7 @@ extern "C" {
#include "condvar.h" #include "condvar.h"
#include "fs.h" #include "fs.h"
#include "kernel.h" #include "kernel.h"
#include "stat.h"
} }
#include "file.hh" #include "file.hh"
...@@ -15,6 +16,9 @@ extern "C" { ...@@ -15,6 +16,9 @@ extern "C" {
#include "sampler.h" #include "sampler.h"
} }
#define LOGHEADER_SZ (sizeof(struct logheader) + \
sizeof(((struct logheader*)0)->cpu[0])*NCPU)
static volatile u64 selector; static volatile u64 selector;
static volatile u64 period; static volatile u64 period;
...@@ -153,20 +157,36 @@ readlog(char *dst, u32 off, u32 n) ...@@ -153,20 +157,36 @@ readlog(char *dst, u32 off, u32 n)
return ret; return ret;
} }
static void
sampstat(struct inode *ip, struct stat *st)
{
struct pmulog *q = &pmulog[NCPU];
struct pmulog *p;
u64 sz = 0;
sz += LOGHEADER_SZ;
for (p = &pmulog[0]; p != q; p++)
sz += p->count * sizeof(struct pmuevent);
st->dev = ip->dev;
st->ino = ip->inum;
st->type = ip->type;
st->nlink = ip->nlink;
st->size = sz;
}
static int static int
sampread(struct inode *ip, char *dst, u32 off, u32 n) sampread(struct inode *ip, char *dst, u32 off, u32 n)
{ {
struct pmulog *q = &pmulog[NCPU]; struct pmulog *q = &pmulog[NCPU];
struct pmulog *p; struct pmulog *p;
struct logheader *hdr; struct logheader *hdr;
u64 hdrlen;
int ret; int ret;
int i; int i;
ret = 0; ret = 0;
hdrlen = sizeof(*hdr) + sizeof(hdr->cpu[0])*NCPU; if (off < LOGHEADER_SZ) {
if (off < hdrlen) { u64 len = LOGHEADER_SZ;
u64 len = hdrlen;
u64 cc; u64 cc;
hdr = (logheader*) kmalloc(len); hdr = (logheader*) kmalloc(len);
...@@ -182,7 +202,7 @@ sampread(struct inode *ip, char *dst, u32 off, u32 n) ...@@ -182,7 +202,7 @@ sampread(struct inode *ip, char *dst, u32 off, u32 n)
i++; i++;
} }
cc = MIN(hdrlen-off, n); cc = MIN(LOGHEADER_SZ-off, n);
memmove(dst, (char*)hdr + off, cc); memmove(dst, (char*)hdr + off, cc);
kmfree(hdr); kmfree(hdr);
...@@ -192,8 +212,8 @@ sampread(struct inode *ip, char *dst, u32 off, u32 n) ...@@ -192,8 +212,8 @@ sampread(struct inode *ip, char *dst, u32 off, u32 n)
dst += cc; dst += cc;
} }
if (off >= hdrlen) if (off >= LOGHEADER_SZ)
ret += readlog(dst, off-hdrlen, n); ret += readlog(dst, off-LOGHEADER_SZ, n);
return ret; return ret;
} }
...@@ -257,4 +277,5 @@ initsamp(void) ...@@ -257,4 +277,5 @@ initsamp(void)
devsw[SAMPLER].write = sampwrite; devsw[SAMPLER].write = sampwrite;
devsw[SAMPLER].read = sampread; devsw[SAMPLER].read = sampread;
devsw[SAMPLER].stat = sampstat;
} }
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论