ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.362 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
… …
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
… …
351our @SLOT_QUEUE; 354our @SLOT_QUEUE;
352our $SLOT_QUEUE; 355our $SLOT_QUEUE;
353 356
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
356 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
357 362
358 while () { 363 while () {
359 next_job: 364 next_job:
360 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
368 } 373 }
369 } 374 }
370 } 375 }
371 376
372 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
373 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
374 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 380 $signal->wait;
376 } else { 381 } else {
377 Coro::schedule; 382 Coro::schedule;
378 } 383 }
… …
422 my $time = Event::time; 427 my $time = Event::time;
423 428
424 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
426 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
427 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
428 # (but this is cancel-safe) 435 # (but this is cancel-safe)
429 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
430 437
431 my $busy = 1; 438 my $busy = 1;
432 my @res; 439 my @res;
433 440
434 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 443 @res = eval { $job->() };
436 warn $@ if $@; 444 warn $@ if $@;
437 undef $busy; 445 undef $busy;
438 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
439 447
… …
507=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
508 516
509Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
510data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
511 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
512=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
513 543
514our $DB; 544our $DB;
515 545
516sub db_init { 546sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 547 cf::sync_job {
521 eval { 548 $DB ||= db_table "db";
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 } 549 };
531} 550}
532 551
533sub db_get($$) { 552sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
535 554
… …
947 966
948=cut 967=cut
949 968
950############################################################################# 969#############################################################################
951# object support 970# object support
952#
953 971
972sub _object_equal($$);
973sub _object_equal($$) {
974 my ($a, $b) = @_;
975
976 return 0 unless (ref $a) eq (ref $b);
977
978 if ("HASH" eq ref $a) {
979 my @ka = keys %$a;
980 my @kb = keys %$b;
981
982 return 0 if @ka != @kb;
983
984 for (0 .. $#ka) {
985 return 0 unless $ka[$_] eq $kb[$_];
986 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
987 }
988
989 } elsif ("ARRAY" eq ref $a) {
990
991 return 0 if @$a != @$b;
992
993 for (0 .. $#$a) {
994 return 0 unless _object_equal $a->[$_], $b->[$_];
995 }
996
997 } elsif ($a ne $b) {
998 return 0;
999 }
1000
1001 1
1002}
1003
1004our $SLOW_MERGES;#d#
954sub _can_merge { 1005sub _can_merge {
955 my ($ob1, $ob2) = @_; 1006 my ($ob1, $ob2) = @_;
956 1007
957 local $Storable::canonical = 1; 1008 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1009
961 $fob1 eq $fob2 1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
962} 1012}
963 1013
964sub reattach { 1014sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1016 my ($obj) = @_;
… …
1012); 1062);
1013 1063
1014sub object_freezer_save { 1064sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
1016 1066
1017 my $guard = cf::lock_acquire "io";
1018
1019 sync_job { 1067 sync_job {
1020 if (length $$rdata) { 1068 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1069 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
1023 $decname, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
… …
1029 close $fh; 1077 close $fh;
1030 1078
1031 if (@$objs) { 1079 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1085 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1087 }
… …
1048 } else { 1096 } else {
1049 aio_unlink $filename; 1097 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
1051 } 1099 }
1052 }; 1100 };
1053
1054 undef $guard;
1055} 1101}
1056 1102
1057sub object_freezer_as_string { 1103sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
1059 1105
… …
1064 1110
1065sub object_thawer_load { 1111sub object_thawer_load {
1066 my ($filename) = @_; 1112 my ($filename) = @_;
1067 1113
1068 my ($data, $av); 1114 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1115
1072 (aio_load $filename, $data) >= 0 1116 (aio_load $filename, $data) >= 0
1073 or return; 1117 or return;
1074 1118
1075 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1121 or return;
1078 1122
1079 undef $guard; 1123 my $st = eval { Coro::Storable::thaw $av }
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1081 } 1126 }
1082 1127
1083 utf8::decode (my $decname = $filename); 1128 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
… …
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1385
1341 my $f = new_from_file cf::object::thawer path $login 1386 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1387 or return;
1343 1388
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1389 my $pl = cf::player::load_pl $f
1346 or return; 1390 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1391 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1392 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
… …
2030 } 2074 }
2031 2075
2032 $MAP_PREFETCH{$path} |= $load; 2076 $MAP_PREFETCH{$path} |= $load;
2033 2077
2034 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
2035 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2083 if (my $map = find $k) {
2038 $map->load if $v; 2084 $map->load if $v;
2039 } 2085 }
… …
2065 return if $self->{deny_save}; 2111 return if $self->{deny_save};
2066 2112
2067 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
2068 2114
2069 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
2071 }; 2118 };
2072 2119
2073 if ($uniq) { 2120 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2261=cut 2308=cut
2262 2309
2263sub deref { 2310sub deref {
2264 my ($ref) = @_; 2311 my ($ref) = @_;
2265 2312
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2314 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2316 or return;
2273 $pl->ob->uuid eq $uuid 2317 $pl->ob->uuid eq $uuid
2274 or return; 2318 or return;
… …
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2490
2447 $self->enter_link; 2491 $self->enter_link;
2448 2492
2449 (async { 2493 (async {
2494 $Coro::current->{desc} = "player::goto $path $x $y";
2495
2496 # *tag paths override both path and x|y
2497 if ($path =~ /^\*(.*)$/) {
2498 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2499 my $ob = $obs[rand @obs];
2500
2501 # see if we actually can go there
2502 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2503 $ob = $obs[rand @obs];
2504 } else {
2505 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2506 }
2507 # else put us there anyways for now #d#
2508
2509 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2510 } else {
2511 ($path, $x, $y) = (undef, undef, undef);
2512 }
2513 }
2514
2450 my $map = eval { 2515 my $map = eval {
2451 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
2452 2517
2453 if ($map) { 2518 if ($map) {
2454 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
2456 } else { 2521 } else {
2457 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2458 } 2523 }
2459 2524
2460 $map 2525 $map
2461 }; 2526 };
2462 2527
… …
2552 # if exit is damned, update players death & WoR home-position 2617 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp) 2618 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED); 2619 if $exit->flag (FLAG_DAMNED);
2555 2620
2556 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2557 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2558 unless (eval { 2625 unless (eval {
2559 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2560 2627
2561 1; 2628 1;
… …
2598 2665
2599=cut 2666=cut
2600 2667
2601our %CHANNEL = ( 2668our %CHANNEL = (
2602 "c/identify" => { 2669 "c/identify" => {
2603 id => "identify", 2670 id => "infobox",
2604 title => "Identify", 2671 title => "Identify",
2605 reply => undef, 2672 reply => undef,
2606 tooltip => "Items recently identified", 2673 tooltip => "Items recently identified",
2607 }, 2674 },
2608 "c/examine" => { 2675 "c/examine" => {
2609 id => "examine", 2676 id => "infobox",
2610 title => "Examine", 2677 title => "Examine",
2611 reply => undef, 2678 reply => undef,
2612 tooltip => "Signs and other items you examined", 2679 tooltip => "Signs and other items you examined",
2613 }, 2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2614); 2687);
2615 2688
2616sub cf::client::send_msg { 2689sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2690 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2691
2619 $msg = $self->pl->expand_cfpod ($msg); 2692 $msg = $self->pl->expand_cfpod ($msg);
2620 2693
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2695
2623 # check predefined channels, for the benefit of C 2696 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2625 2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2626 if (ref $channel) { 2705 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2706 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2707 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2708 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2709 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg; 2710 if $self->can_msg;
… …
2848=pod 2927=pod
2849 2928
2850The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2851 2930
2852 cf::object 2931 cf::object
2853 contr pay_amount pay_player map x y force_find force_add 2932 contr pay_amount pay_player map x y force_find force_add destroy
2854 insert remove name archname title slaying race decrease_ob_nr 2933 insert remove name archname title slaying race decrease_ob_nr
2855 2934
2856 cf::object::player 2935 cf::object::player
2857 player 2936 player
2858 2937
… …
2865=cut 2944=cut
2866 2945
2867for ( 2946for (
2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race 2948 insert remove inv name archname title slaying race
2870 decrease_ob_nr)], 2949 decrease_ob_nr destroy)],
2871 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2873 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2874) { 2953) {
2875 no strict 'refs'; 2954 no strict 'refs';
… …
3150sub main { 3229sub main {
3151 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
3153 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3154 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
3155 Event::one_event; 3235 Event::one_event;
3156 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
3157 }; 3237 };
3158 3238
3159 reload_config; 3239 reload_config;
… …
3231 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
3233 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3317 $pl->save;
3237 } 3318 }
3238 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
3239 3320
3240 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
… …
3403register_command "reload" => sub { 3484register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
3405 3486
3406 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3491 reload_perl;
3492 };
3409 } 3493 }
3410}; 3494};
3411 3495
3412unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
3413 3497
… …
3432 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3518 $signal->wait;
3435} 3519}
3436 3520
3437 my $min = 1e6;#d#
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
3440 reentrant => 0, 3522 reentrant => 0,
3441 parked => 1, 3523 parked => 1,
3442 prio => 0, 3524 prio => 0,
3443 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
… …
3451 3533
3452 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
3453 3535
3454 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
3455 3537
3456 0 && sync_job {#d#
3457 for(1..10) {
3458 my $t = Event::time;
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3460 or die;
3461
3462 $map->width (50);
3463 $map->height (50);
3464 $map->alloc;
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3466 my $t = Event::time - $t;
3467
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 };
3478
3479 $RUNTIME += $TICK; 3538 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
3481 3540
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3545 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
3487 }; 3547 };
3488 } 3548 }
3489 3549
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3551 $sig->send;
3495 } 3552 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3554 $sig->send;
… …
3507 3564
3508 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3567
3511 _post_tick; 3568 _post_tick;
3512
3513
3514 }, 3569 },
3515); 3570);
3516 3571
3517{ 3572{
3573 BDB::min_parallel 8;
3518 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
3519 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
3520 reentrant => 0, 3576 reentrant => 0,
3521 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
3522 poll => 'r', 3578 poll => 'r',
3523 prio => 0, 3579 prio => 0,
3524 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
3526 ); 3582 );
3527 BDB::min_parallel 8;
3528 3583
3529 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
3530 my $status; 3585 my $status;
3531 my $current = $Coro::current; 3586 my $current = $Coro::current;
3532 ( 3587 (
… …
3541 ) 3596 )
3542 }; 3597 };
3543 3598
3544 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
3545 $DB_ENV = BDB::db_env_create; 3600 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3602 | BDB::LOG_AUTOREMOVE, 1);
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3546 3605
3547 cf::sync_job { 3606 cf::sync_job {
3548 eval { 3607 eval {
3549 BDB::db_env_open 3608 BDB::db_env_open
3550 $DB_ENV, 3609 $DB_ENV,
… …
3552 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3611 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3613 0666;
3555 3614
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 3616 };
3561 3617
3562 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3619 };
3564 } 3620 }
3621
3622 $BDB_DEADLOCK_WATCHER = Event->timer (
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 );
3632 $BDB_CHECKPOINT_WATCHER = Event->timer (
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 );
3642 $BDB_TRICKLE_WATCHER = Event->timer (
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 );
3565} 3652}
3566 3653
3567{ 3654{
3568 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
3569 3656
… …
3572 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3573 reentrant => 0, 3660 reentrant => 0,
3574 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3576 poll => 'r', 3663 poll => 'r',
3577 prio => 6, 3664 prio => 0,
3578 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3579 ); 3666 );
3580} 3667}
3581 3668
3582my $_log_backtrace; 3669my $_log_backtrace;
… …
3588 3675
3589 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3678 ++$_log_backtrace;
3592 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3593 my @bt = fork_call { 3682 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3685 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3597 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines