Mercurial > archived > louis > epitech > mq > rathaxes

annotate rathaxes_add_a_patch_to_illustrate_issue_8.patch @ 32:c7c59cebab85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a patch to illustrate pointcuts in type definition to illustrate #8
author Louis Opter <louis@lse.epitech.net>
date Sat, 07 Jan 2012 23:56:11 +0100
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
32
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
1 # HG changeset patch
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
2 # Parent f91d274916763989466df5f948ee32a48930b028
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
3 Add a patch to illustrate pointcuts in type definition to illustrate #8
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
4
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
5 diff --git a/rathaxes/samples/lkm/e1000.blt b/rathaxes/samples/lkm/e1000.blt
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
6 --- a/rathaxes/samples/lkm/e1000.blt
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
7 +++ b/rathaxes/samples/lkm/e1000.blt
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
8 @@ -2,25 +2,20 @@
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
9 {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
10 template type e1000::Context()
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
11 {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
12 - chunk LKM::includes()
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
13 + chunk Ethernet::Context()
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
14 {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
15 - /*
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
16 - * Force the generation of the structure in the "headers part, we
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
17 - * have to do this since we do not use the structure in this blt
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
18 - * (we hacked a bit and used it in ethernet.blt directly).
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
19 - */
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
20 - typedef int ${e1000::Context}; /* CNorm __std__ workaround */
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
21 - ${e1000::Context} force_declaration_in_includes;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
22 + struct
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
23 + {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
24 + int bars;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
25 + unsigned char /* __iomem */ *ioaddr;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
26 + } rtx_e1000_ctx;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
27 }
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
28
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
29 - chunk ::decl()
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
30 - {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
31 - struct rtx_e1000_ctx
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
32 - {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
33 - int bars;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
34 - unsigned char /* __iomem */ *ioaddr;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
35 - };
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
36 - }
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
37 + /*
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
38 + * Not sure about how chunk ::init will look in that case maybe we
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
39 + * would need a second pointcut that would insert code in chunk ::init
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
40 + * in Ethernet::Context? (and this chunk would be implemented here).
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
41 + */
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
42
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
43 map
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
44 {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
45 diff --git a/rathaxes/samples/lkm/e1000.rti b/rathaxes/samples/lkm/e1000.rti
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
46 --- a/rathaxes/samples/lkm/e1000.rti
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
47 +++ b/rathaxes/samples/lkm/e1000.rti
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
48 @@ -1,6 +1,9 @@
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
49 interface e1000 : Socket, Ethernet, PCI, LKM
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
50 {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
51 - provided type e1000::Context;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
52 + provided type e1000::Context
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
53 + {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
54 + provided chunk Ethernet::Context;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
55 + }
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
56
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
57 /* Not sure if we need the argument */
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
58 provided sequence e1000::create()
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
59 diff --git a/rathaxes/samples/lkm/ethernet.blt b/rathaxes/samples/lkm/ethernet.blt
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
60 --- a/rathaxes/samples/lkm/ethernet.blt
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
61 +++ b/rathaxes/samples/lkm/ethernet.blt
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
62 @@ -22,7 +22,8 @@
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
63 struct net_device *net_dev;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
64
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
65 /* while waiting on issue #8 */
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
66 - struct rtx_e1000_ctx hw_ctx;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
67 + /* struct rtx_e1000_ctx hw_ctx; */
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
68 + ${pointcut Ethernet::Context};
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
69 };
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
70 }
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
71
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
72 diff --git a/rathaxes/samples/lkm/ethernet.rti b/rathaxes/samples/lkm/ethernet.rti
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
73 --- a/rathaxes/samples/lkm/ethernet.rti
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
74 +++ b/rathaxes/samples/lkm/ethernet.rti
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
75 @@ -1,6 +1,9 @@
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
76 interface Ethernet : Socket, PCI, LKM
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
77 {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
78 - provided type Ethernet::Device;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
79 + provided type Ethernet::Device
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
80 + {
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
81 + provided pointcut Ethernet::Context;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
82 + }
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
83
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
84 required variable ::string Ethernet::ifname;
c7c59cebab85 Add a patch to illustrate pointcuts in type definition to illustrate #8
Louis Opter <louis@lse.epitech.net>
parents:
diff changeset
85