From bf3a0ece7894c764e53601317f4e8543c1aacc4f Mon Sep 17 00:00:00 2001 From: mykola2312 <49044616+mykola2312@users.noreply.github.com> Date: Sat, 20 Jul 2024 16:59:04 +0300 Subject: [PATCH] switch project from cpp to c language since cpp has no benefits what so ever and only confuses everything --- Makefile | 16 ++++++++-------- include/process.h | 17 +++-------------- src/{dummy_target.cpp => dummy_target.c} | 6 ++---- src/main.c | 8 ++++++++ src/main.cpp | 15 --------------- src/process.c | 1 + src/process.cpp | 6 ------ 7 files changed, 22 insertions(+), 47 deletions(-) rename src/{dummy_target.cpp => dummy_target.c} (96%) create mode 100644 src/main.c delete mode 100644 src/main.cpp create mode 100644 src/process.c delete mode 100644 src/process.cpp diff --git a/Makefile b/Makefile index a920eb1..b75d984 100644 --- a/Makefile +++ b/Makefile @@ -3,23 +3,23 @@ SRC_DIR = src OBJ_DIR = obj BIN_DIR = bin -CC = g++ +CC = gcc LD = ld -CXXFLAGS = -Wall -I$(INC_DIR) +CFLAGS = -Wall -I$(INC_DIR) LDFLAGS = -BLACKJACK_SRC = main.cpp process.cpp -BLACKJACK_OBJ := $(addprefix $(OBJ_DIR)/,$(patsubst %.cpp,%.o,$(BLACKJACK_SRC))) +BLACKJACK_SRC = main.c process.c +BLACKJACK_OBJ := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(BLACKJACK_SRC))) BLACKJACK_SRC := $(addprefix $(SRC_DIR)/,$(BLACKJACK_SRC)) BLACKJACK_DEPS = process.h BLACKJACK_DEPS := $(addprefix $(INC_DIR)/,$(BLACKJACK_DEPS)) -DUMMY_TARGET_SRC = dummy_target.cpp -DUMMY_TARGET_OBJ := $(addprefix $(OBJ_DIR)/,$(patsubst %.cpp,%.o,$(DUMMY_TARGET_SRC))) +DUMMY_TARGET_SRC = dummy_target.c +DUMMY_TARGET_OBJ := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(DUMMY_TARGET_SRC))) DUMMY_TARGET_SRC := $(addprefix $(SRC_DIR)/,$(DUMMY_TARGET_SRC)) -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp - $(CC) $(CXXFLAGS) -c -o $@ $< +$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c + $(CC) $(CFLAGS) -c -o $@ $< blackjack: $(BLACKJACK_OBJ) $(BLACKJACK_DEPS) $(CC) $(LDFLAGS) -o $(BIN_DIR)/$@ $(BLACKJACK_OBJ) diff --git a/include/process.h b/include/process.h index 7524f6d..08151b7 100644 --- a/include/process.h +++ b/include/process.h @@ -1,15 +1,4 @@ -#pragma once +#ifndef __PROCESS_H +#define __PROCESS_H -#include -#include -#include - -class Process -{ -public: - Process(pid_t pid) : pid(pid) {} - - static std::optional FindByName(std::string name); -private: - pid_t pid; -}; \ No newline at end of file +#endif \ No newline at end of file diff --git a/src/dummy_target.cpp b/src/dummy_target.c similarity index 96% rename from src/dummy_target.cpp rename to src/dummy_target.c index 3e75621..3ab814c 100644 --- a/src/dummy_target.cpp +++ b/src/dummy_target.c @@ -28,7 +28,7 @@ __attribute__((noreturn)) void slave2_job() status("slave2"); puts("[slave2] will do something each second"); - while (true) + while (1) { __asm__("nop"); sleep(1); @@ -40,13 +40,11 @@ __attribute__((noreturn)) void* slave3_job(void*) status("slave3"); puts("[slave3] will do something each second but in a thread"); - while (true) + while (1) { __asm__("nop"); sleep(1); } - - return NULL; } int main() diff --git a/src/main.c b/src/main.c new file mode 100644 index 0000000..7df6fa1 --- /dev/null +++ b/src/main.c @@ -0,0 +1,8 @@ +#include +#include "process.h" + +int main(int argc, char** argv) +{ + + return 0; +} \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100644 index f2babeb..0000000 --- a/src/main.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include "process.h" - -int main(int argc, char** argv) -{ - auto proc = Process::FindByName("dummy_target"); - if (proc) proc = proc.value(); - else - { - fputs("process not found\n", stderr); - return 1; - } - - return 0; -} \ No newline at end of file diff --git a/src/process.c b/src/process.c new file mode 100644 index 0000000..aaf2a9f --- /dev/null +++ b/src/process.c @@ -0,0 +1 @@ +#include "process.h" diff --git a/src/process.cpp b/src/process.cpp deleted file mode 100644 index 1a808eb..0000000 --- a/src/process.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "process.h" - -std::optional Process::FindByName(std::string name) -{ - return {}; -}