gem-graph/gem-graph-server
gem-graph
/
gem-graph-server
3
0
Fork 0
Code Issues 14 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.os-k.eu:222/gem-graph-team/gem-graph-server

This commit is contained in:
Jean Sirmai 2021-06-11 13:58:48 +02:00
parent f43445f320 cbfcdb389f
commit 65628bc569
Signed by untrusted user who does not match committer: jean
GPG Key ID: FB3115C340E057E3
6 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -24,7 +24,7 @@ LDFLAGS= -lc -lpthread
BINDIR=bin
SRCDIR=src
DEBDIR=debian
OBJ=$(BINDIR)/scheduler.o $(BINDIR)/server.o $(BINDIR)/localthread.o $(BINDIR)/main.o
OBJ=$(BINDIR)/scheduler.o $(BINDIR)/server.o $(BINDIR)/localworker.o $(BINDIR)/main.o
.DEFAULT_GOAL:= all
.PHONY: all clean deb

4
include/localthread.h → include/localworker.h
View File

@ -1,5 +1,5 @@
//=-------------------------------------------------------------------------=//
// Scheduler definition //
// Local workers definition //
// //
// Copyright © 2021 The Gem-graph Project //
// //
@ -22,3 +22,5 @@
#ifndef BASE_H
#include "../include/base.h"
#endif

17
include/scheduler.h
View File

@ -25,6 +25,19 @@
pthread_t *SchedInit(SchedulerParams_t *parameters);
int SchedWait(pthread_t *schedThread);
// -------------------------------------------------------------------------- //
// Scheduler destructor function //
// -------------------------------------------------------------------------- //
static inline int SchedDestroy(pthread_t *schedThread)
{
free(schedThread);
return 0;
}
int SchedDestroy(pthread_t *schedThread);
// -------------------------------------------------------------------------- //
// Scheduler wait function //
// -------------------------------------------------------------------------- //
static inline void SchedWait(pthread_t *schedThread)
{
pthread_join(*schedThread, NULL);
}

0
src/localthread.c → src/localworker.c
View File

4
src/main.c
View File

@ -31,7 +31,7 @@
void SchedulerCrashTest(void)
{
const int maxthread = 2000;
const int maxthread = 16;
SchedulerParams_t *parameters =
(SchedulerParams_t*) calloc(1, sizeof(SchedulerParams_t));
@ -97,7 +97,7 @@ int main(int argc, char **argv)
free(parameters);
SchedulerCrashTest();
//SchedulerCrashTest();
return 0;
}

19
src/scheduler.c
View File

@ -20,7 +20,7 @@
//=-------------------------------------------------------------------------=//
#include "../include/base.h"
#include "../include/localthread.h"
#include "../include/localworker.h"
static void *GreatScheduler(void *parameters);
@ -36,23 +36,6 @@ pthread_t *SchedInit(SchedulerParams_t *parameters)
return parameters->id;
}
// -------------------------------------------------------------------------- //
// Scheduler destructor function //
// -------------------------------------------------------------------------- //
int SchedDestroy(pthread_t *schedThread)
{
free(schedThread);
return 0;
}
// -------------------------------------------------------------------------- //
// Scheduler wait function //
// -------------------------------------------------------------------------- //
void SchedWait(pthread_t *schedThread)
{
pthread_join(*schedThread, NULL);
}
// -------------------------------------------------------------------------- //
// Scheduler thread main function //
// -------------------------------------------------------------------------- //