Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
key-value-store
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Samarth Joshi
key-value-store
Commits
b6242314
Commit
b6242314
authored
Oct 26, 2020
by
Samarth Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding Comments
parent
70aaa378
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
12 deletions
+18
-12
KVServer
KVServer
+0
-0
KVServer.c
KVServer.c
+18
-12
No files found.
KVServer
View file @
b6242314
No preview for this file type
KVServer.c
View file @
b6242314
...
@@ -82,13 +82,14 @@ void *worker(void *args) {
...
@@ -82,13 +82,14 @@ void *worker(void *args) {
int
epollfd
;
int
epollfd
;
int
*
newfd
=
malloc
(
sizeof
(
int
));
int
*
newfd
=
malloc
(
sizeof
(
int
));
read_pipe
=
((
int
*
)
args
)[
0
];
//assigned the read end of the pipe
epollfd
=
epoll_create1
(
0
);
epollfd
=
epoll_create1
(
0
);
if
(
epollfd
==
-
1
)
{
if
(
epollfd
==
-
1
)
{
perror
(
"epoll_create1"
);
perror
(
"epoll_create1"
);
exit
(
EXIT_FAILURE
);
exit
(
EXIT_FAILURE
);
}
}
/* Add the pipe which we get from main thread */
read_pipe
=
((
int
*
)
args
)[
0
];
ev
.
events
=
EPOLLIN
;
ev
.
events
=
EPOLLIN
;
ev
.
data
.
fd
=
read_pipe
;
ev
.
data
.
fd
=
read_pipe
;
if
(
epoll_ctl
(
epollfd
,
EPOLL_CTL_ADD
,
read_pipe
,
&
ev
)
==
-
1
)
{
if
(
epoll_ctl
(
epollfd
,
EPOLL_CTL_ADD
,
read_pipe
,
&
ev
)
==
-
1
)
{
...
@@ -104,7 +105,11 @@ void *worker(void *args) {
...
@@ -104,7 +105,11 @@ void *worker(void *args) {
}
}
for
(
i
=
0
;
i
<
nfds
;
++
i
)
{
for
(
i
=
0
;
i
<
nfds
;
++
i
)
{
if
(
events
[
i
].
data
.
fd
==
read_pipe
)
{
if
(
events
[
i
].
data
.
fd
==
read_pipe
)
{
fflush
(
stdout
);
/* if we get a request from main thread to add new client
ie. events[i].data.fd is equal to the pipe which we use to talk with main thread
- read this newfd from pipe
- add this newfd to epoll instance to monitor for client requests
*/
read
(
read_pipe
,
newfd
,
sizeof
(
newfd
));
read
(
read_pipe
,
newfd
,
sizeof
(
newfd
));
printf
(
"
\n
read %d
\n
"
,
*
newfd
);
printf
(
"
\n
read %d
\n
"
,
*
newfd
);
ev
.
data
.
fd
=*
newfd
;
ev
.
data
.
fd
=*
newfd
;
...
@@ -114,24 +119,25 @@ void *worker(void *args) {
...
@@ -114,24 +119,25 @@ void *worker(void *args) {
exit
(
EXIT_FAILURE
);
exit
(
EXIT_FAILURE
);
}
}
fflush
(
stdout
);
}
else
{
}
/* if we get a request from client
else
{
ie. events[i].data.fd is equal to the client socket fd
*/
int
flag
=
events
[
i
].
events
;
int
flag
=
events
[
i
].
events
;
if
(
flag
&
EPOLLRDHUP
)
{
if
(
flag
&
EPOLLRDHUP
)
{
/* Connection was closed.
/* Connection was closed.
Remove socket from epoll instance
- Remove socket from epoll instance
Close the socket and dont process more info from this socket
- Close the socket and dont process more info from this socket
Note: This if block should be before EPOLLIN
*/
*/
char
eof
;
read
(
events
[
i
].
data
.
fd
,
&
eof
,
sizeof
(
char
));
epoll_ctl
(
epollfd
,
EPOLL_CTL_DEL
,
events
[
i
].
data
.
fd
,
NULL
);
epoll_ctl
(
epollfd
,
EPOLL_CTL_DEL
,
events
[
i
].
data
.
fd
,
NULL
);
close
(
events
[
i
].
data
.
fd
);
close
(
events
[
i
].
data
.
fd
);
continue
;
continue
;
}
}
if
(
flag
&
EPOLLIN
)
{
if
(
flag
&
EPOLLIN
)
{
/* Parse the actual message from client */
struct
message
*
requestMessage
=
malloc
(
sizeof
(
struct
message
));
struct
message
*
requestMessage
=
malloc
(
sizeof
(
struct
message
));
int
readlength
=
read
(
events
[
i
].
data
.
fd
,
requestMessage
,
sizeof
(
struct
message
));
int
readlength
=
read
(
events
[
i
].
data
.
fd
,
requestMessage
,
sizeof
(
struct
message
));
printf
(
"
\n
[Message Received from client]
\n
[[Status:%c][Key:%s][Value:%s]]"
,
requestMessage
->
status
,
requestMessage
->
key
,
requestMessage
->
value
);
printf
(
"
\n
[Message Received from client]
\n
[[Status:%c][Key:%s][Value:%s]]"
,
requestMessage
->
status
,
requestMessage
->
key
,
requestMessage
->
value
);
...
@@ -156,7 +162,7 @@ int main (int argc, int argv) {
...
@@ -156,7 +162,7 @@ int main (int argc, int argv) {
struct
sockaddr_in
serv_addr
,
cli_addr
;
struct
sockaddr_in
serv_addr
,
cli_addr
;
//int *pipes = (int*) malloc(pool_thread_size * 2 * sizeof(pipes));
//int *pipes = (int*) malloc(pool_thread_size * 2 * sizeof(pipes));
int
pipes
[
5
][
2
];
int
pipes
[
5
][
2
];
// TODO: initialize pipes dynamically
// initialize thread pool with initial pool size
// initialize thread pool with initial pool size
threads
=
malloc
(
pool_thread_size
*
sizeof
(
pthread_t
));
threads
=
malloc
(
pool_thread_size
*
sizeof
(
pthread_t
));
...
@@ -194,7 +200,7 @@ int main (int argc, int argv) {
...
@@ -194,7 +200,7 @@ int main (int argc, int argv) {
perror
(
"ERROR on accept"
);
perror
(
"ERROR on accept"
);
write
(
pipes
[
next
][
1
],
&
newsockfd
,
sizeof
(
newsockfd
));
write
(
pipes
[
next
][
1
],
&
newsockfd
,
sizeof
(
newsockfd
));
printf
(
"main thread
ka fd ka
value: %d
\n
"
,
newsockfd
);
printf
(
"main thread value: %d
\n
"
,
newsockfd
);
fflush
(
stdout
);
fflush
(
stdout
);
next
=
(
next
+
1
)
%
pool_thread_size
;
next
=
(
next
+
1
)
%
pool_thread_size
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment