onebinary: working entrypoint generation

Author: iameli

meson.build

@@ -209,9 +209,10 @@ onebinary_stuff = []
 onebinary_stuff += 'MistOutRTMP'
 onebinary_stuff += 'MistOutHLS'
 onebinary_stuff += 'MistOutHTTP'
-onebinary_stuff += 'MistInBuffer'
+# onebinary_stuff += 'MistInBuffer'
 
 onebinary_tgts = []
+onebinary_sources = []
 
 ## This makes sure all (installable) executables are build in top level directory
 ## Done because MistController expects its binaries to all be in the same directory
@@ -236,19 +237,19 @@ foreach exec : executables
 endforeach
 
 prog_python = find_program('python3')
+script = files('scripts/onebinary_gen.py')
 
 onebinary_header = custom_target('onebinary',
   input: [onebinary_tgts],
-  output: ['controller_static_capabilities.cpp'],
-  command: [prog_python, '../scripts/onebinary_gen.py', '--cap-header', '@OUTPUT0@', '--entrypoint', 'foo.cpp', '@INPUT@'],
+  output: ['controller_static_capabilities.cpp', 'mistserver.cpp'],
+  command: [prog_python, script, '--cap-header', '@OUTPUT0@', '--entrypoint', '@OUTPUT1@', '@INPUT@'],
   depends: [onebinary_tgts]
 )
 
 onebinary = executable(
   'MistServer',
   [
     files(
-      'src/mistserver.cpp',
       'src/input/input.cpp',
       'src/input/input_buffer.cpp',
       'src/output/output.cpp',
@@ -271,6 +272,7 @@ onebinary = executable(
       'src/controller/controller_push.cpp',
       'src/controller/controller_variables.cpp',
     ),
+    onebinary_sources,
     io_cpp,
     header_tgts,
     embed_tgts,

scripts/onebinary_gen.py

@@ -31,18 +31,23 @@
   json_str = json.dumps(text)
   category = ''
   connector = ''
+  class_name = ''
   if stem.startswith(MIST_IN):
     category = "inputs"
     connector = stem[len(MIST_IN):]
+    class_name = "Mist::In" + connector
   elif stem.startswith(MIST_OUT):
     category = "connectors"
     connector = stem[len(MIST_OUT):]
+    class_name = "Mist::Out" + connector
   else:
     raise Exception("unknown binary naming convention: " + stem)
   capabilities.append({
     'json_str': json_str,
     'category': category,
     'connector': connector,
+    'class_name': class_name,
+    'binary_name' : stem,
   })
 
 cap_lines = [
@@ -62,3 +67,58 @@
 
 out_fullpath = os.path.join(os.getcwd(), args.cap_header)
 Path(out_fullpath).write_text('\n'.join(cap_lines))
+
+entrypoint_lines = []
+
+entrypoint_lines.extend([
+  '#include <mist/config.h>',
+  '#include <mist/defines.h>',
+  '#include <mist/socket.h>',
+  '#include <mist/util.h>',
+  '#include <mist/stream.h>',
+  '#include "src/output/mist_out.cpp"',
+  '#include "src/output/output_rtmp.h"',
+  '#include "src/output/output_hls.h"',
+  '#include "src/output/output_http_internal.h"',
+  '#include "src/input/mist_in.cpp"',
+  '#include "src/input/input_buffer.h"',
+  '#include "src/session.cpp"',
+  '#include "src/controller/controller.cpp"',
+  'int main(int argc, char *argv[]){',
+  '  if (argc < 2) {',
+  '    return ControllerMain(argc, argv);',
+  '  }',
+  '  // Create a new argv array without argv[1]',
+  '  int new_argc = argc - 1;',
+  '  char** new_argv = new char*[new_argc];',
+  '  for (int i = 0, j = 0; i < argc; ++i) {',
+  '      if (i != 1) {',
+  '          new_argv[j++] = argv[i];',
+  '      }',
+  '  }',
+  '  if (strcmp(argv[1], "MistController") == 0) {',
+  '    return ControllerMain(new_argc, new_argv);',
+  '  }',
+])
+
+for cap in capabilities:
+  entrypoint_lines.extend([
+  '  else if (strcmp(argv[1], "' + cap['binary_name'] + '") == 0) {',
+  '    return OutputMain<' + cap['class_name'] + '>(new_argc, new_argv);',
+  '  }',
+  ])
+
+entrypoint_lines.extend([
+  '  else if (strcmp(argv[1], "MistSession") == 0) {',
+  '    return SessionMain(new_argc, new_argv);',
+  '  }',
+  '  else {',
+  '    return ControllerMain(argc, argv);',
+  '  }',
+  '  INFO_MSG("binary not found: %s", argv[1]);',
+  '  return 202;',
+  '}',
+])
+
+entrypoint_fullpath = os.path.join(os.getcwd(), args.entrypoint)
+Path(entrypoint_fullpath).write_text('\n'.join(entrypoint_lines))

src/input/input_buffer.h

@@ -60,5 +60,5 @@ namespace Mist{
 }// namespace Mist
 
 #ifndef ONE_BINARY
-typedef Mist::inputBuffer mistIn;
+typedef Mist::InputBuffer mistIn;
 #endif