Chore/remove boost (#52)

* Remove boost filesystem

* Remove boost format

* Update gitignore

* Remove algorithm

* Last touches

Author: C-likethis123

.gitignore

@@ -43,3 +43,7 @@ DartConfiguration.tcl
 
 # Clangd Cache
 .cache/
+
+# Ninja logs
+trace*.json
+ninja_log

CMakeLists.txt

@@ -19,7 +19,7 @@ set(Boost_CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(BOOST_INCLUDE_LIBRARIES filesystem system iostreams uuid format algorithm)
+set(BOOST_INCLUDE_LIBRARIES iostreams uuid algorithm)
 
 include(FetchContent)
 FetchContent_Declare(

doc/case studies/Optimising binary size.md

@@ -38,4 +38,33 @@ Could this take up majority of the binary as well? Looks like most of the symbol
 0000000100094020 0000000000000000 D __ZGVZNK5TCLAP12ArgException4whatEvE2ex
 0000000100094008 0000000000000000 D __ZZNK5TCLAP12ArgException4whatEvE2ex
 0000000100094000 0000000000000000 D __ZZN5TCLAP3Arg12delimiterRefEvE5delim
-```
+```
+
+# After removing filesystem
+
+`du -sh app/gyt`: 396K
+
+```
+0000000100078041 0000000000000000 b __ZN5boost11optional_nsL16in_place_init_ifE
+0000000100078040 0000000000000000 b __ZN5boost11optional_nsL13in_place_initE
+0000000100078038 0000000000000000 D __ZZNK5boost17integral_constantIbLb1EEcvRKN4mpl_5bool_ILb1EEEEvE5pdata
+0000000100078030 0000000000000000 D __ZZN5TCLAP24OptionalUnlabeledTracker18alreadyOptionalRefEvE2ct
+0000000100078028 0000000000000000 D __ZZN5TCLAP3Arg13ignoreRestRefEvE3ign
+0000000100078020 0000000000000000 D __ZGVZNK5TCLAP12ArgException4whatEvE2ex
+0000000100078008 0000000000000000 D __ZZNK5TCLAP12ArgException4whatEvE2ex
+0000000100078000 0000000000000000 D __ZZN5TCLAP3Arg12delimiterRefEvE5delim
+0000000100074980 0000000000000000 s __ZTVN5boost9iostreams13stream_bufferINS0_6detail12mode_adapterINS0_6outputENSt3__114basic_iostreamIcNS5_11char_traitsIcEEEEEES8_NS5_9allocatorIcEES4_EE
+0000000100074968 0000000000000000 s __ZTIN5boost9iostreams21basic_zlib_compressorINSt3__19allocatorIcEEEE
+0000000100074958 0000000000000000 s __ZTIN5boost9iostreams16symmetric_filterINS0_6detail20zlib_compressor_implINSt3__19allocatorIcEEEES6_EE
+0000000100074900 0000000000000000 s __ZTIN5boost9iostreams16symmetric_filterINS0_6detail20zlib_compressor_implINSt3__19allocatorIcEEEES6_E8categoryE
+0000000100074888 0000000000000000 s __ZTCN5boost9iostreams16symmetric_filterINS0_6detail20zlib_compressor_implINSt3__19allocatorIcEEEES6_E8categoryE8_NS0_10filter_tagE
+0000000100074848 0000000000000000 s __ZTCN5boost9iostreams16symmetric_filterINS0_6detail20zlib_compressor_implINSt3__19allocatorIcEEEES6_E8categoryE0_NS0_8dual_useE
+0000000100074750 0000000000000000 s __ZTVN5boost9iostreams16symmetric_filterINS0_6detail20zlib_compressor_implINSt3__19allocatorIcEEEES6_E8categoryE
+0000000100074688 0000000000000000 s __ZTVN5boost9iostreams6detail18indirect_streambufINS0_21basic_zlib_compressorINSt3__19allocatorIcEEEENS4_11char_traitsIcEES6_NS0_6outputEEE
+0000000100074670 0000000000000000 s __ZTIN5boost9iostreams13stream_bufferINS0_21basic_zlib_compressorINSt3__19allocatorIcEEEENS3_11char_traitsIcEES5_NS0_6outputEEE
+0000000100074658 0000000000000000 s __ZTIN5boost9iostreams6detail18indirect_streambufINS0_21basic_zlib_compressorINSt3__19allocatorIcEEEENS4_11char_traitsIcEES6_NS0_6outputEEE
+0000000100074590 0000000000000000 s __ZTVN5boost9iostreams13stream_bufferINS0_21basic_zlib_compressorINSt3__19allocatorIcEEEENS3_11char_traitsIcEES5_NS0_6outputEEE
+0000000100074578 0000000000000000 s __ZTIN5boost6detail17sp_counted_impl_pINS_9iostreams16symmetric_filterINS2_6detail20zlib_compressor_implINSt3__19allocatorIcEEEES8_E4implEEE
+```
+
+Removing format: 364K

include/blob.h

@@ -1,7 +1,6 @@
 #ifndef BLOB_H
 #define BLOB_H
 
-#include <boost/filesystem.hpp>
 #include <string>
 
 #include "object.h"

include/object.h

@@ -1,12 +1,12 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include <boost/filesystem.hpp>
+#include <filesystem>
 #include <string>
 
 #include "repository.h"
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 class GitObject {
 public:
   GitObject();

include/repository.h

@@ -1,11 +1,11 @@
 #ifndef REPOSITORY_H
 #define REPOSITORY_H
 
-#include <boost/filesystem.hpp>
+#include <filesystem>
 #include <optional>
 #include <string>
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 class GitRepository {
 public:
   GitRepository(fs::path worktree, fs::path gitdir);

include/tree.h

@@ -2,11 +2,11 @@
 #define TREE_H
 
 #include "object.h"
-#include <boost/filesystem.hpp>
+#include <filesystem>
 #include <string>
 #include <unordered_map>
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 class GitTree : public GitObject {
 public:
   GitTree(const std::string &data = std::string(""));

include/util.h

@@ -1,9 +1,9 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include <boost/filesystem.hpp>
+#include <filesystem>
 #include <string>
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 
 std::string read_file(const fs::path &filePath, bool remove_newline = false);
 bool create_file(const fs::path &filePath, const std::string &content = "");

src/CMakeLists.txt

@@ -2,11 +2,8 @@
 add_library(boost_libraries INTERFACE)
 target_link_libraries(
   boost_libraries
-  INTERFACE Boost::filesystem
-            Boost::system
-            Boost::iostreams
+  INTERFACE Boost::iostreams
             Boost::uuid
-            Boost::format
             Boost::algorithm)
 
 add_library(util util.cpp)

src/blob.cpp

@@ -1,10 +1,5 @@
 #include "blob.h"
 
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
-#include <boost/iostreams/copy.hpp>
-#include <boost/iostreams/filter/zlib.hpp>
-#include <boost/iostreams/filtering_streambuf.hpp>
 #include <string>
 
 #include "repository.h"

src/object.cpp

@@ -3,18 +3,14 @@
 #include "commit.h"
 #include "tree.h"
 #include "util.h"
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
 #include <boost/iostreams/copy.hpp>
-#include <boost/iostreams/detail/optional.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
 #include <boost/iostreams/filtering_streambuf.hpp>
 
 #include <fstream>
 #include <iostream>
 #include <sstream>
 #include <stdexcept>
-#include <vector>
 
 GitObject::GitObject() { this->init(); }
 GitObject::GitObject(const std::string &format) { this->format = format; }
@@ -24,9 +20,8 @@ void GitObject::init() {}
 GitObject *GitObject::read(GitRepository &repo, const std::string &sha) {
   std::string dir = sha.substr(0, 2);
   std::string path = sha.substr(2);
-  std::string file_path = (boost::format("objects/%1%/%2%") % dir % path).str();
-  fs::path file_to_create = fs::path(file_path);
-  fs::path paths = repo.file(file_to_create);
+  fs::path file_path = fs::path("objects") / dir / path;
+  fs::path paths = repo.file(file_path);
 
   if (!fs::is_regular_file(paths)) {
     throw std::runtime_error(paths.string() + " is not found");
@@ -77,11 +72,9 @@ std::string GitObject::write(GitRepository &repo, std::string &type,
     std::string sha = sha1_hexdigest(result);
 
     if (write) {
-      std::string file_path =
-          (boost::format("objects/%1%/%2%") % sha.substr(0, 2) % sha.substr(2))
-              .str();
-      fs::path file_to_create = fs::path(file_path);
-      fs::path paths = repo.file(file_to_create);
+      fs::path file_path =
+          fs::path("objects") / sha.substr(0, 2) / sha.substr(2);
+      fs::path paths = repo.file(file_path);
 
       // compress files
       std::stringstream compressed;

src/repository.cpp

@@ -1,10 +1,10 @@
 #include "repository.h"
-#include "boost/filesystem/path.hpp"
 #include "inih/INIReader.h"
 #include "util.h"
+#include <filesystem>
 #include <iostream>
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 
 GitRepository::GitRepository(std::string path, bool force)
     : worktree(fs::path(path)), gitdir(fs::path(path) / ".git") {
@@ -83,7 +83,7 @@ fs::path GitRepository::dir(const fs::path &path, bool mkdir) {
 Returns and optionally creates a path to a file or a directory
 */
 fs::path GitRepository::file(fs::path &path, bool mkdir) {
-  if (dir(path.branch_path(), mkdir) != fs::path("")) {
+  if (dir(path.parent_path(), mkdir) != fs::path("")) {
     return repo_path(path);
   }
   return fs::path("");

src/tree.cpp

@@ -3,7 +3,6 @@
 #include "object.h"
 #include "repository.h"
 #include "util.h"
-#include <boost/filesystem.hpp>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -99,8 +98,7 @@ void GitTree::instantiate_tree(GitTree *treeToInstantiate, GitTree *curr_tree,
       }
       // assumption here: the file is created, so change the file mode
       if (mode != curr_mode) {
-        boost::filesystem::permissions(new_file_path,
-                                       get_unix_permissions(mode));
+        fs::permissions(new_file_path, get_unix_permissions(mode));
       }
     } else {
       // not found in the current tree, create it
@@ -113,7 +111,7 @@ void GitTree::instantiate_tree(GitTree *treeToInstantiate, GitTree *curr_tree,
         instantiate_tree(subTreeToInstantiate, new_file_path);
       }
       // assumption here: the file is created, so change the file mode
-      boost::filesystem::permissions(new_file_path, get_unix_permissions(mode));
+      fs::permissions(new_file_path, get_unix_permissions(mode));
     }
   }
   // remove items that are not in the tree that I am instantiating
@@ -151,6 +149,6 @@ void GitTree::instantiate_tree(GitTree *treeToInstantiate,
       instantiate_tree(subTreeToInstantiate, new_file_path);
     }
 
-    boost::filesystem::permissions(new_file_path, get_unix_permissions(mode));
+    fs::permissions(new_file_path, get_unix_permissions(mode));
   }
 }

src/util.cpp

@@ -1,13 +1,13 @@
 #include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/uuid/detail/sha1.hpp>
+#include <filesystem>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <string>
 
-namespace fs = boost::filesystem;
+namespace fs = std::filesystem;
 
 std::string read_file(const fs::path &filePath, bool remove_newline = false) {
   try {
@@ -52,10 +52,10 @@ bool create_file(const fs::path &filePath, const std::string &content = "") {
     } else {
       std::cerr << "Error opening the file for writing: " << filePath << "\n"
                 << "Parent path exists: " << fs::exists(filePath.parent_path())
-                << "\n"
-                << "Permissions: "
-                << fs::status(filePath.parent_path()).permissions()
-                << std::endl;
+                << "\n";
+      // << "Permissions: "
+      // << fs::status(filePath.parent_path()).permissions()
+      // << std::endl;
       return false;
     }
   } catch (const std::exception &e) {
@@ -113,40 +113,37 @@ fs::perms get_unix_permissions(int mode) {
   std::string file_type = get_file_type(mode);
   // set default permission for directories
   if (file_type == "tree") {
-    return boost::filesystem::perms::owner_read |
-           boost::filesystem::perms::owner_write |
-           boost::filesystem::perms::owner_exe |
-           boost::filesystem::perms::group_read |
-           boost::filesystem::perms::group_exe |
-           boost::filesystem::perms::others_read |
-           boost::filesystem::perms::others_exe;
+    return fs::perms::owner_read | fs::perms::owner_write |
+           fs::perms::owner_exec | fs::perms::group_read |
+           fs::perms::group_exec | fs::perms::others_read |
+           fs::perms::others_exec;
   }
   mode = mode & 0x1FF;
-  boost::filesystem::perms permissions = fs::perms::no_perms;
+  fs::perms permissions = fs::perms::none;
 
   // Owner permissions
   if (mode & 0400)
-    permissions |= boost::filesystem::perms::owner_read;
+    permissions |= fs::perms::owner_read;
   if (mode & 0200)
-    permissions |= boost::filesystem::perms::owner_write;
+    permissions |= fs::perms::owner_write;
   if (mode & 0100)
-    permissions |= boost::filesystem::perms::owner_exe;
+    permissions |= fs::perms::owner_exec;
 
   // Group permissions
   if (mode & 0040)
-    permissions |= boost::filesystem::perms::group_read;
+    permissions |= fs::perms::group_read;
   if (mode & 0020)
-    permissions |= boost::filesystem::perms::group_write;
+    permissions |= fs::perms::group_write;
   if (mode & 0010)
-    permissions |= boost::filesystem::perms::group_exe;
+    permissions |= fs::perms::group_exec;
 
   // Others permissions
   if (mode & 0004)
-    permissions |= boost::filesystem::perms::others_read;
+    permissions |= fs::perms::others_read;
   if (mode & 0002)
-    permissions |= boost::filesystem::perms::others_write;
+    permissions |= fs::perms::others_write;
   if (mode & 0001)
-    permissions |= boost::filesystem::perms::others_exe;
+    permissions |= fs::perms::others_exec;
 
   return permissions;
 }