diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index c674098..8e86778 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,366 @@ -# ---> Linux +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +UdpServer/src/Common/** +!UdpServer/src/Common/readme.txt + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Oo]ut/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* *~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk -# KDE directory preferences -.directory +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ -# Linux trash folder which might appear on any partition or disk -.Trash-* +# RIA/Silverlight projects +Generated_Code/ -# .nfs files are created when an open file is removed but is still being accessed -.nfs* +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd \ No newline at end of file diff --git a/UdpServer/.cproject b/UdpServer/.cproject new file mode 100644 index 0000000..69fbf46 --- /dev/null +++ b/UdpServer/.cproject @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UdpServer/.project b/UdpServer/.project new file mode 100644 index 0000000..e5b9104 --- /dev/null +++ b/UdpServer/.project @@ -0,0 +1,27 @@ + + + UdpServer + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/UdpServer/.settings/language.settings.xml b/UdpServer/.settings/language.settings.xml new file mode 100644 index 0000000..5946607 --- /dev/null +++ b/UdpServer/.settings/language.settings.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UdpServer/.settings/org.eclipse.cdt.core.prefs b/UdpServer/.settings/org.eclipse.cdt.core.prefs new file mode 100644 index 0000000..c8ec5df --- /dev/null +++ b/UdpServer/.settings/org.eclipse.cdt.core.prefs @@ -0,0 +1,6 @@ +doxygen/doxygen_new_line_after_brief=true +doxygen/doxygen_use_brief_tag=false +doxygen/doxygen_use_javadoc_tags=true +doxygen/doxygen_use_pre_tag=false +doxygen/doxygen_use_structural_commands=false +eclipse.preferences.version=1 diff --git a/UdpServer/.settings/org.eclipse.core.resources.prefs b/UdpServer/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/UdpServer/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/UdpServer/src/BasicThread.cpp b/UdpServer/src/BasicThread.cpp new file mode 100644 index 0000000..6c6a1d2 --- /dev/null +++ b/UdpServer/src/BasicThread.cpp @@ -0,0 +1,110 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "BasicThread.hpp" +#include "Exception.hpp" +#include "TimeoutError.hpp" +#include "UdpSocket.hpp" +#include "LinuxProc.hpp" + +//------------------------------------------------------------------------ + +BasicThread::BasicThread(const std::string& name) : + Thread(name), + m_shallWeQuit(false), + m_shallWeSuspend(false), + m_startCondition(name + "_START_EVENT") +{ + try + { + + } + catch (Exception& e) + { + e.buildStackTrace(__PRETTY_FUNCTION__); + throw e; + } + catch (...) + { + throw Exception(__PRETTY_FUNCTION__, "caught unknown error"); + } +} + +//------------------------------------------------------------------------ + +BasicThread::~BasicThread() +{ + +} + +//------------------------------------------------------------------------ + +void BasicThread::operator()() +{ + std::cout << "Thread started..." << std::endl; + + const int BUF_SIZE = 100; + char buf[BUF_SIZE]; + while (true) + { + try + { + std::cout << "Waiting for data..." << std::endl; + int len = LinuxProc::Instance().GetSocket().read(buf,BUF_SIZE); + + if (len > 0) + { + std::cout << "Received data: " << std::string(buf) << std::endl; + std::string data = "Server Acknowledged"; + LinuxProc::Instance().GetSocket().write(data.c_str(), data.length() + 1); + } + else + { + break; + } + } + catch (TimeoutError& e) + { + e.buildStackTrace(__PRETTY_FUNCTION__); + + if (e.m_timeOutType == TimeoutError::TIME_OUT_SOCKET) + std::cout << "socket error" << std::endl; + } + catch (Exception& e) + { + e.buildStackTrace(__PRETTY_FUNCTION__); + std::cout << e.getMessage() << std::endl; + } + catch (...) + { + } + }//end outer loop + + std::cout << "thread has exited" << std::endl; +} + +//------------------------------------------------------------------------ + +void BasicThread::quit() +{ + LinuxProc::Instance().GetSocket().close(); +} + +//------------------------------------------------------------------------ + +bool BasicThread::ShallWeExit() +{ + return m_shallWeQuit; +} + +//------------------------------------------------------------------------ + +bool BasicThread::ShallWeSuspend() +{ + return m_shallWeSuspend; +} diff --git a/UdpServer/src/BasicThread.hpp b/UdpServer/src/BasicThread.hpp new file mode 100644 index 0000000..52f6dd2 --- /dev/null +++ b/UdpServer/src/BasicThread.hpp @@ -0,0 +1,89 @@ +#pragma once + +#include "Thread.hpp" + +class BasicThread : public Thread +{ +public: + //>--------------------------------------------------------------------- + // Function: Thread() + // + // Purpose: constructor + //---------------------------------------------------------------------- + // Arguments: name - the name of this thread + // streamName - the hsdc stream name to read from + // pVideoFrameTableAllocated - the buffer to put the data we read into + // pProc - the process this thread is running under + //---------------------------------------------------------------------- + // Return Value: none + //<--------------------------------------------------------------------- + BasicThread(const std::string& name); + + //>--------------------------------------------------------------------- + // Function: ~Thread() + // + // Purpose: destructor + //---------------------------------------------------------------------- + // Arguments: none + //---------------------------------------------------------------------- + // Return Value: none + //<--------------------------------------------------------------------- + virtual ~BasicThread(); + + //>--------------------------------------------------------------------- + // Function: operator()() + // + // Purpose: where all the action is in the derived classes + //---------------------------------------------------------------------- + // Arguments: none + //---------------------------------------------------------------------- + // Return Value: none + //<--------------------------------------------------------------------- + virtual void operator()(); + + //>--------------------------------------------------------------------- + // Function: StartThread() + // + // Purpose: Commands the thread to run + //---------------------------------------------------------------------- + // Arguments: none + //---------------------------------------------------------------------- + // Return Value: nonestd + //<--------------------------------------------------------------------- + virtual void startThread(){m_startCondition.signal();} + + //>--------------------------------------------------------------------- + // Function: SuspendThread() + // + // Purpose: Commands the thread to pause its execution + //---------------------------------------------------------------------- + // Arguments: none + //---------------------------------------------------------------------- + // Return Value: none + //<--------------------------------------------------------------------- + virtual void suspendThread(){m_shallWeSuspend = true;} + + //>--------------------------------------------------------------------- + // Function: Quit() + // + // Purpose: Command the thread to exit + //---------------------------------------------------------------------- + // Arguments: none + //---------------------------------------------------------------------- + // Return Value: none + //<--------------------------------------------------------------------- + virtual void quit(); + +private: + // do not allow + BasicThread(); + BasicThread(const BasicThread ©); + BasicThread &operator=(const BasicThread &rhs); + + bool ShallWeSuspend(); + bool ShallWeExit(); + + bool m_shallWeQuit; + bool m_shallWeSuspend; + Condition m_startCondition; +}; diff --git a/UdpServer/src/Common/readme.txt b/UdpServer/src/Common/readme.txt new file mode 100644 index 0000000..5889c5e --- /dev/null +++ b/UdpServer/src/Common/readme.txt @@ -0,0 +1 @@ +Drop the common library code in here \ No newline at end of file diff --git a/UdpServer/src/LinuxProc.cpp b/UdpServer/src/LinuxProc.cpp new file mode 100644 index 0000000..ebe01b9 --- /dev/null +++ b/UdpServer/src/LinuxProc.cpp @@ -0,0 +1,36 @@ +#include "LinuxProc.hpp" +#include "Exception.hpp" +#include "UdpSocket.hpp" + +#include + +//----------------------------------------------------------------------------- + +LinuxProc& LinuxProc::Instance() +{ + static LinuxProc proc; + return proc; +} + +//----------------------------------------------------------------------------- + +LinuxProc::LinuxProc() +{ + try { + m_udpSock = new UdpSocket("server", 44444); + + } catch (Exception& e) { + + throw; + } +} + +//----------------------------------------------------------------------------- + +LinuxProc::~LinuxProc() +{ + if (m_udpSock != 0) + { + delete m_udpSock; + } +} diff --git a/UdpServer/src/LinuxProc.hpp b/UdpServer/src/LinuxProc.hpp new file mode 100644 index 0000000..51f99bf --- /dev/null +++ b/UdpServer/src/LinuxProc.hpp @@ -0,0 +1,64 @@ +#ifndef LINUXPROC_H +#define LINUXPROC_H + +#include "Proc.hpp" + +class UdpSocket; +class IniFile; + +class LinuxProc : public Proc +{ + +public: + //>--------------------------------------------------------------------------- + // Function: instance + // + // Purpose: singleton + //---------------------------------------------------------------------------- + // Arguments: + //---------------------------------------------------------------------------- + // Return Value: + //---------------------------------------------------------------------------- + static LinuxProc& Instance(); + + //>--------------------------------------------------------------------------- + // Function: ~Proc + // + // Purpose: Destroyer + //---------------------------------------------------------------------------- + // Arguments: + //---------------------------------------------------------------------------- + // Return Value: + //---------------------------------------------------------------------------- + ~LinuxProc(); + + //>--------------------------------------------------------------------------- + // Function: getConfig + // + // Purpose: + //---------------------------------------------------------------------------- + // Arguments: + //---------------------------------------------------------------------------- + // Return Value: + //---------------------------------------------------------------------------- + IniFile& getConfig(){return *m_iniFile;}; + + UdpSocket& GetSocket(){return *m_udpSock;} + +private: + //>--------------------------------------------------------------------------- + // Function: Proc + // + // Purpose: Ctor + //---------------------------------------------------------------------------- + // Arguments: + //---------------------------------------------------------------------------- + // Return Value: + //---------------------------------------------------------------------------- + LinuxProc(); + + UdpSocket* m_udpSock; + IniFile* m_iniFile; +}; + +#endif diff --git a/UdpServer/src/main.cpp b/UdpServer/src/main.cpp new file mode 100644 index 0000000..93c382e --- /dev/null +++ b/UdpServer/src/main.cpp @@ -0,0 +1,31 @@ +//============================================================================ +// Name : Test.cpp +// Author : +// Version : +// Copyright : Your copyright notice +// Description : Hello World in C++, Ansi-style +//============================================================================ + +#include + +#include "BasicThread.hpp" +#include "MiscUtil.hpp" +#include "DateTimeUtil.hpp" +#include "UdpSocket.hpp" + +using namespace std; + +int main() { + + BasicThread* myThread = new BasicThread("BasicThread"); + myThread->create(); + myThread->resume(); + + //cout << "Waiting for thread to exit..." << endl; + myThread->waitForThreadToExit(); + + cout << "\nPress any key to exit..." << endl; + Util::Misc::ReadFromStandardInput(); + + return 0; +} diff --git a/git_scripts/ignore_a_tracked_file.sh b/git_scripts/ignore_a_tracked_file.sh new file mode 100644 index 0000000..06dc9d6 --- /dev/null +++ b/git_scripts/ignore_a_tracked_file.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +length=${#1}; + +if [[ $length -eq 0 ]] +then + echo "Please specify a tracked file to ignore"; + exit 1 +fi + +git update-index --skip-worktree $1 diff --git a/git_scripts/list_tracked_files_under_main_branch.sh b/git_scripts/list_tracked_files_under_main_branch.sh new file mode 100644 index 0000000..bceca92 --- /dev/null +++ b/git_scripts/list_tracked_files_under_main_branch.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +git ls-tree -r main --name-only diff --git a/git_scripts/unignore_a_tracked_file.sh b/git_scripts/unignore_a_tracked_file.sh new file mode 100644 index 0000000..4415a6c --- /dev/null +++ b/git_scripts/unignore_a_tracked_file.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +length=${#1}; + +if [[ $length -eq 0 ]] +then + echo "Please specify a tracked file to ignore"; + exit 1 +fi + +git update-index --no-skip-worktree $1