← Back to branch summary

~ubuntu-branches/ubuntu/lucid/erlang/lucid-proposed

« back to all changes in this revision

Viewing changes to lib/test_server/src/ts_install.erl

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-06-11 12:18:07 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090611121807-ks7eb4xrt7dsysgx
Tags: 1:13.b.1-dfsg-1
http://bugs.debian.org/529512
* New upstream release.
* Removed unnecessary dependency of erlang-os-mon on erlang-observer and
  erlang-tools and added missing dependency of erlang-nox on erlang-os-mon
  (closes: #529512).
* Removed a patch to eunit application because the bug was fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/test_server/src/ts_install.erl
174
174
    LinuxDist = linux_dist(),
175
175
    ExtraLabel = extra_platform_label(),
176
176
    Schedulers = schedulers(),
 
177
    BindType = bind_type(),
177
178
    KP = kernel_poll(),
178
179
    IOTHR = io_thread(),
179
180
    LC = lock_checking(),
183
184
    Debug = debug(),
184
185
    CpuBits = word_size(),
185
186
    Common = lists:concat([Hostname,"/",OsType,"/",CpuType,CpuBits,LinuxDist,
186
 
                           Schedulers,KP,IOTHR,LC,MT,AsyncThreads,HeapType,
187
 
                           Debug,ExtraLabel]),
 
187
                           Schedulers,BindType,KP,IOTHR,LC,MT,AsyncThreads,
 
188
                           HeapType,Debug,ExtraLabel]),
188
189
    PlatformId = lists:concat([ErlType, " ", Version, Common]),
189
190
    PlatformLabel = ErlType ++ Common,
190
191
    PlatformFilename = platform_as_filename(PlatformId),
254
255
 
255
256
schedulers() ->
256
257
    case catch erlang:system_info(smp_support) of
257
 
        true -> "/S"++integer_to_list(erlang:system_info(schedulers));
258
 
        _ -> ""
259
 
    end.
 
258
        true ->
 
259
            case {erlang:system_info(schedulers),
 
260
                  erlang:system_info(schedulers_online)} of
 
261
                {S,S} ->
 
262
                    "/S"++integer_to_list(S);
 
263
                {S,O} ->
 
264
                    "/S"++integer_to_list(S) ++ ":" ++
 
265
                        integer_to_list(O)
 
266
            end;
 
267
        _ -> ""
 
268
    end.
 
269
 
 
270
bind_type() ->
 
271
    case catch erlang:system_info(scheduler_bind_type) of
 
272
        thread_no_node_processor_spread -> "/sbttnnps";
 
273
        no_node_processor_spread -> "/sbtnnps";
 
274
        no_node_thread_spread -> "/sbtnnts";
 
275
        processor_spread -> "/sbtps";
 
276
        thread_spread -> "/sbtts";
 
277
        no_spread -> "/sbtns";
 
278
        _ -> ""
 
279
    end.
 
280
                                        
260
281
 
261
282
debug() ->
262
283
    case string:str(erlang:system_info(system_version), "debug") of