Browse Source

Fixed if-statement for argument checking in reg/2

git-svn-id: http://svn.ulf.wiger.net/gproc/branches/experimental-0906/gproc@43 f3948e33-8234-0410-8a80-a07eae3b6c4d
hanssv 15 years ago
parent
commit
6096cc8a2b
3 changed files with 11 additions and 5 deletions
  1. 6 0
      src/Makefile
  2. 2 2
      src/Unit-Quick-Files/gproc_eqc.erl
  3. 3 3
      src/gproc.erl

+ 6 - 0
src/Makefile

@@ -55,6 +55,9 @@ $(beams) : %.beam : %.erl
 ./Unit-Quick-Files/gproc_eqc.beam : ./Unit-Quick-Files/gproc_eqc.erl
 	$(EQC_ERLC) $<
 
+./Unit-Quick-Files/gproc_pulse.beam : ./Unit-Quick-Files/gproc_pulse.erl
+	$(EQC_ERLC) $<
+
 doc: ../doc/edoc-info
 
 ../doc/edoc-info: ../doc/overview.edoc $(SOURCES)
@@ -66,3 +69,6 @@ test : all ./Unit-Quick-Files/gproc_eqc.beam
 
 itest : all ./Unit-Quick-Files/gproc_eqc.beam
 	$(EQC_ERL) -s eqc start
+
+pulsetest : all ./Unit-Quick-Files/gproc_pulse.beam
+	$(EQC_ERL) -pa ../../scheduler_msg -pa -s eqc start 

+ 2 - 2
src/Unit-Quick-Files/gproc_eqc.erl

@@ -7,8 +7,8 @@
 
 -module(gproc_eqc).
 
--include("eqc.hrl").
--include("eqc_statem.hrl").
+-include_lib("eqc/include/eqc.hrl").
+-include_lib("eqc/include/eqc_statem.hrl").
 
 -compile(export_all).
 

+ 3 - 3
src/gproc.erl

@@ -37,7 +37,7 @@
 %% @end
 -module(gproc).
 -behaviour(gen_server).
-
+ 
 -export([start_link/0,
          reg/1, reg/2, unreg/1,
          mreg/3,
@@ -276,8 +276,8 @@ reg({p,l,_} = Key, Value) ->
     local_reg(Key, Value);
 reg({T,l,_} = Key, Value) when T==n; T==c; T==a ->
     %% local names, counters and aggregated counters
-    if T=/=n andalso is_integer(Value) ->
-	    true;
+    if T =:= n orelse is_integer(Value) ->
+			true;
        true ->
             erlang:error(badarg)
     end,