Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 364138
b: refs/heads/master
c: f7d751f
h: refs/heads/master
v: v3
  • Loading branch information
Wanpeng Li authored and Greg Kroah-Hartman committed Apr 13, 2013
1 parent 761326d commit 8b1f694
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1dbdd2fb479511267b6949a0a6eceb277e13ca6c
refs/heads/master: f7d751ff1d866faf723c5ed4d9a7815c37bc07cd
67 changes: 67 additions & 0 deletions trunk/drivers/staging/zcache/ramster/debug.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,59 @@ extern ssize_t ramster_remote_page_flushes_failed;

int ramster_debugfs_init(void);

static inline void inc_ramster_eph_pages_remoted(void)
{
ramster_eph_pages_remoted++;
};
static inline void inc_ramster_pers_pages_remoted(void)
{
ramster_pers_pages_remoted++;
};
static inline void inc_ramster_eph_pages_remote_failed(void)
{
ramster_eph_pages_remote_failed++;
};
static inline void inc_ramster_pers_pages_remote_failed(void)
{
ramster_pers_pages_remote_failed++;
};
static inline void inc_ramster_remote_eph_pages_succ_get(void)
{
ramster_remote_eph_pages_succ_get++;
};
static inline void inc_ramster_remote_pers_pages_succ_get(void)
{
ramster_remote_pers_pages_succ_get++;
};
static inline void inc_ramster_remote_eph_pages_unsucc_get(void)
{
ramster_remote_eph_pages_unsucc_get++;
};
static inline void inc_ramster_remote_pers_pages_unsucc_get(void)
{
ramster_remote_pers_pages_unsucc_get++;
};
static inline void inc_ramster_pers_pages_remote_nomem(void)
{
ramster_pers_pages_remote_nomem++;
};
static inline void inc_ramster_remote_objects_flushed(void)
{
ramster_remote_objects_flushed++;
};
static inline void inc_ramster_remote_object_flushes_failed(void)
{
ramster_remote_object_flushes_failed++;
};
static inline void inc_ramster_remote_pages_flushed(void)
{
ramster_remote_pages_flushed++;
};
static inline void inc_ramster_remote_page_flushes_failed(void)
{
ramster_remote_page_flushes_failed++;
};

#else

static inline void inc_ramster_flnodes(void) { };
Expand All @@ -71,6 +124,20 @@ static inline void dec_ramster_foreign_eph_pages(void) { };
static inline void inc_ramster_foreign_pers_pages(void) { };
static inline void dec_ramster_foreign_pers_pages(void) { };

static inline void inc_ramster_eph_pages_remoted(void) { };
static inline void inc_ramster_pers_pages_remoted(void) { };
static inline void inc_ramster_eph_pages_remote_failed(void) { };
static inline void inc_ramster_pers_pages_remote_failed(void) { };
static inline void inc_ramster_remote_eph_pages_succ_get(void) { };
static inline void inc_ramster_remote_pers_pages_succ_get(void) { };
static inline void inc_ramster_remote_eph_pages_unsucc_get(void) { };
static inline void inc_ramster_remote_pers_pages_unsucc_get(void) { };
static inline void inc_ramster_pers_pages_remote_nomem(void) { };
static inline void inc_ramster_remote_objects_flushed(void) { };
static inline void inc_ramster_remote_object_flushes_failed(void) { };
static inline void inc_ramster_remote_pages_flushed(void) { };
static inline void inc_ramster_remote_page_flushes_failed(void) { };

static inline int ramster_debugfs_init(void)
{
return 0;
Expand Down
32 changes: 16 additions & 16 deletions trunk/drivers/staging/zcache/ramster/ramster.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ int ramster_localify(int pool_id, struct tmem_oid *oidp, uint32_t index,
pr_err("UNTESTED pampd==NULL in ramster_localify\n");
#endif
if (eph)
ramster_remote_eph_pages_unsucc_get++;
inc_ramster_remote_eph_pages_unsucc_get();
else
ramster_remote_pers_pages_unsucc_get++;
inc_ramster_remote_pers_pages_unsucc_get();
obj = NULL;
goto finish;
} else if (unlikely(!pampd_is_remote(pampd))) {
Expand All @@ -167,9 +167,9 @@ int ramster_localify(int pool_id, struct tmem_oid *oidp, uint32_t index,
pr_err("UNTESTED dup while waiting in ramster_localify\n");
#endif
if (eph)
ramster_remote_eph_pages_unsucc_get++;
inc_ramster_remote_eph_pages_unsucc_get();
else
ramster_remote_pers_pages_unsucc_get++;
inc_ramster_remote_pers_pages_unsucc_get();
obj = NULL;
pampd = NULL;
ret = -EEXIST;
Expand All @@ -178,7 +178,7 @@ int ramster_localify(int pool_id, struct tmem_oid *oidp, uint32_t index,
/* no remote data, delete the local is_remote pampd */
pampd = NULL;
if (eph)
ramster_remote_eph_pages_unsucc_get++;
inc_ramster_remote_eph_pages_unsucc_get();
else
BUG();
delete = true;
Expand Down Expand Up @@ -209,9 +209,9 @@ int ramster_localify(int pool_id, struct tmem_oid *oidp, uint32_t index,
BUG_ON(extra == NULL);
zcache_decompress_to_page(data, size, (struct page *)extra);
if (eph)
ramster_remote_eph_pages_succ_get++;
inc_ramster_remote_eph_pages_succ_get();
else
ramster_remote_pers_pages_succ_get++;
inc_ramster_remote_pers_pages_succ_get();
ret = 0;
finish:
tmem_localify_finish(obj, index, pampd, saved_hb, delete);
Expand Down Expand Up @@ -296,7 +296,7 @@ void *ramster_pampd_repatriate_preload(void *pampd, struct tmem_pool *pool,
c = atomic_dec_return(&ramster_remote_pers_pages);
WARN_ON_ONCE(c < 0);
} else {
ramster_pers_pages_remote_nomem++;
inc_ramster_pers_pages_remote_nomem();
}
local_irq_restore(flags);
out:
Expand Down Expand Up @@ -435,9 +435,9 @@ static void ramster_remote_flush_page(struct flushlist_node *flnode)
remotenode = flnode->xh.client_id;
ret = r2net_remote_flush(xh, remotenode);
if (ret >= 0)
ramster_remote_pages_flushed++;
inc_ramster_remote_pages_flushed();
else
ramster_remote_page_flushes_failed++;
inc_ramster_remote_page_flushes_failed();
preempt_enable_no_resched();
ramster_flnode_free(flnode, NULL);
}
Expand All @@ -452,9 +452,9 @@ static void ramster_remote_flush_object(struct flushlist_node *flnode)
remotenode = flnode->xh.client_id;
ret = r2net_remote_flush_object(xh, remotenode);
if (ret >= 0)
ramster_remote_objects_flushed++;
inc_ramster_remote_objects_flushed();
else
ramster_remote_object_flushes_failed++;
inc_ramster_remote_object_flushes_failed();
preempt_enable_no_resched();
ramster_flnode_free(flnode, NULL);
}
Expand Down Expand Up @@ -505,18 +505,18 @@ int ramster_remotify_pageframe(bool eph)
* But count them so we know if it becomes a problem.
*/
if (eph)
ramster_eph_pages_remote_failed++;
inc_ramster_eph_pages_remote_failed();
else
ramster_pers_pages_remote_failed++;
inc_ramster_pers_pages_remote_failed();
break;
} else {
if (!eph)
atomic_inc(&ramster_remote_pers_pages);
}
if (eph)
ramster_eph_pages_remoted++;
inc_ramster_eph_pages_remoted();
else
ramster_pers_pages_remoted++;
inc_ramster_pers_pages_remoted();
/*
* data was successfully remoted so change the local version to
* point to the remote node where it landed
Expand Down

0 comments on commit 8b1f694

Please sign in to comment.