Merge remote-tracking branch 'origin/master'

README.md

@@ -1,7 +1,7 @@
 eFaw
 =====
 
-An OTP application
+Eralng's Factories and workers.
 
 Build
 -----
@@ -15,3 +15,13 @@ Useage
     3 send your async task to your factory: eFaw:inWork(myFactory, [{report_log, xxxx}, {write_log, yyyyyy}]).
     4 apply your sync task to your factory: eFaw:syncWork(myFactory, retTag, 5000, {report_log, xxxx}).
     5 then worker auto do the task
+
+    all API:
+        start/0               %% start app
+        stop/0                %% stop app
+        openF/2               %% Open a factory
+        closeF/1              %% close a factory
+        hireW/3               %% hire worker
+        inWork/2              %% Insert async task
+        inWorks/2             %% Insert async tasks
+        syncWork/4            %% Insert sync task And wait for the result to receive

src/Faw/fwFMgr.erl

@@ -27,6 +27,9 @@ start_link() ->
 init(_Args) ->
    {ok, #{}}.
 
+handleCall({mNewQueue, FName}, _State, _FROM) ->
+   Ret = fwQueue:new(FName),
+   {reply, Ret};
 handleCall(_Msg, _State, _FROM) ->
    ?ERR("~p call receive unexpect msg ~p ~n ", [?MODULE, _Msg]),
    {reply, ok}.

src/Faw/fwKvsToBeam.erl

@@ -4,7 +4,7 @@
    load/2
 ]).
 
-%% 注意 map类型的数据不能当做key
+%% attention: map() can not make as key
 -type key() :: atom() | binary() | bitstring() | float() | integer() | list() | tuple().
 -type value() :: atom() | binary() | bitstring() | float() | integer() | list() | tuple() | map().
 

src/Faw/fwQueue.erl

@@ -30,7 +30,8 @@ in(Name, Value) ->
 
 -spec ins(Name :: atom(), Values :: [term()]) -> true.
 ins(Name, Values) ->
-   [ets:insert(Name, {erlang:unique_integer(), Value}) || Value <- Values],
+   Tasks = [{erlang:unique_integer(), Value} || Value <- Values],
+   ets:insert(Name, Tasks),
    true.
 
 -spec outF(Name :: atom()) -> empty | Value :: term().

src/eFaw.erl

@@ -3,14 +3,14 @@
 -include("eFaw.hrl").
 
 -export([
-   start/0                 %% 启动应用
-   , stop/0                %% 停止应用
-   , openF/2               %% 开个工厂
-   , closeW/1              %% 关闭工厂
-   , hireW/3               %% 录用工人
-   , inWork/2              %% 插入异步工作
-   , inWorks/2             %% 插入异步工作
-   , syncWork/4            %% 插入同步工作 并等待返回结果
+   start/0                 %% start app
+   , stop/0                %% stop app
+   , openF/2               %% Open a factory
+   , closeF/1              %% close a factory
+   , hireW/3               %% hire worker
+   , inWork/2              %% Insert async task
+   , inWorks/2             %% Insert async tasks
+   , syncWork/4            %% Insert sync task And wait for the result to receive
 ]).
 
 start() ->
@@ -43,6 +43,7 @@ openF(FName, Kvs) ->
       modules => [fwWSup]
    },
    Ret = supervisor:start_child(eFaw_sup, FChildSpec),
+   FName = gen_srv:call(fwFMgr, {mNewQueue, FName}),
    fwKvsToBeam:load(FName, initCfg(Kvs)),
    hireW(FName:getV(?wFCnt), FName, false),
    Ret.
@@ -53,7 +54,7 @@ hireW(WorkerNum, FName, IsTmp) when is_integer(WorkerNum), WorkerNum > 0 ->
 hireW(_WorkerNum, _FName, _IsTmp) ->
    ok.
 
-closeW(FName) ->
+closeF(FName) ->
    supervisor:terminate_child(eFaw_sup, FName).
 
 -spec inWork(FName :: atom(), Work :: term()) -> true | false.
@@ -64,14 +65,14 @@ inWork(FName, Work) ->
    WFCnt = FName:getV(?wFCnt),
    if
       FTaskLen > FTMax ->
-         %% 查看是否超过工厂负载;
+         %% The factory is overloaded
          false;
       FTaskLen == FTLfl ->
-         %% 查看是否需要雇佣零时工   ;
+         %% See factory if need to hire hourly worker
          gen_srv:send(fwFMgr, mChAddW),
          fwQueue:in(FName, Work);
       FTaskLen < WFCnt ->
-         %% 查看是否需要唤醒空闲的工人
+         %% See if need to wake up idle workers
          gen_srv:send(fwFMgr, mChAwkW),
          fwQueue:in(FName, Work);
       true ->
@@ -86,14 +87,14 @@ inWorks(FName, Works) ->
    WFCnt = FName:getV(?wFCnt),
    if
       FTaskLen > FTMax ->
-         %% 查看是否超过工厂负载;
+         %% The factory is overloaded.
          false;
       FTaskLen == FTLfl ->
-         %% 查看是否需要雇佣零时工   ;
+         %% See factory if need to hire hourly worker
          gen_srv:send(fwFMgr, mChAddW),
          fwQueue:ins(FName, Works);
       FTaskLen < WFCnt ->
-         %% 查看是否需要唤醒空闲的工人
+         %% See if need to wake up idle workers
          gen_srv:send(fwFMgr, mChAwkW),
          fwQueue:ins(FName, Works);
       true ->
@@ -108,10 +109,10 @@ syncWork(FName, RetTag, Timeout, Work) ->
    WFCnt = FName:getV(?wFCnt),
    if
       FTaskLen > FTMax ->
-         %% 查看是否超过工厂负载;
+         %% The factory is overloaded.
          false;
       FTaskLen == FTLfl ->
-         %% 查看是否需要雇佣零时工   ;
+         %% See factory if need to hire hourly worker
          gen_srv:send(fwFMgr, mChAddW),
          fwQueue:in(FName, Work),
          receive
@@ -121,7 +122,7 @@ syncWork(FName, RetTag, Timeout, Work) ->
                timeout
          end;
       FTaskLen < WFCnt ->
-         %% 查看是否需要唤醒空闲的工人
+         %% See if need to wake up idle workers
          gen_srv:send(fwFMgr, mChAwkW),
          fwQueue:in(FName, Work),
          receive