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.387 by root, Mon Oct 15 23:49:10 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
440 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
441 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
442 } 454 }
443 455
444 $time = Event::time - $time; 456 $time = Event::time - $time;
445 457
446 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
507=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
508 520
509Stores the given C<$value> in the family. It can currently store binary 521Stores 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). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
511 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
512=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
513 547
514our $DB; 548our $DB;
515 549
516sub db_init { 550sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 551 cf::sync_job {
521 eval { 552 $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 } 553 };
531} 554}
532 555
533sub db_get($$) { 556sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
535 558
… …
947 970
948=cut 971=cut
949 972
950############################################################################# 973#############################################################################
951# object support 974# object support
952#
953 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
954sub _can_merge { 1009sub _can_merge {
955 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
956 1011
957 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1013
961 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
962} 1016}
963 1017
964sub reattach { 1018sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1012); 1066);
1013 1067
1014sub object_freezer_save { 1068sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1016 1070
1017 my $guard = cf::lock_acquire "io";
1018
1019 sync_job { 1071 sync_job {
1020 if (length $$rdata) { 1072 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1073 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1023 $decname, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
… …
1029 close $fh; 1081 close $fh;
1030 1082
1031 if (@$objs) { 1083 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1089 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1091 }
… …
1048 } else { 1100 } else {
1049 aio_unlink $filename; 1101 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1051 } 1103 }
1052 }; 1104 };
1053
1054 undef $guard;
1055} 1105}
1056 1106
1057sub object_freezer_as_string { 1107sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1059 1109
… …
1064 1114
1065sub object_thawer_load { 1115sub object_thawer_load {
1066 my ($filename) = @_; 1116 my ($filename) = @_;
1067 1117
1068 my ($data, $av); 1118 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1119
1072 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1073 or return; 1121 or return;
1074 1122
1075 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1125 or return;
1078 1126
1079 undef $guard; 1127 my $st = eval { Coro::Storable::thaw $av }
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1081 } 1130 }
1082 1131
1083 utf8::decode (my $decname = $filename); 1132 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
… …
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1389
1341 my $f = new_from_file cf::object::thawer path $login 1390 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1391 or return;
1343 1392
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1393 my $pl = cf::player::load_pl $f
1346 or return; 1394 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1395 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1396 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
… …
2030 } 2078 }
2031 2079
2032 $MAP_PREFETCH{$path} |= $load; 2080 $MAP_PREFETCH{$path} |= $load;
2033 2081
2034 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
2035 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2087 if (my $map = find $k) {
2038 $map->load if $v; 2088 $map->load if $v;
2039 } 2089 }
… …
2065 return if $self->{deny_save}; 2115 return if $self->{deny_save};
2066 2116
2067 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
2068 2118
2069 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2071 }; 2122 };
2072 2123
2073 if ($uniq) { 2124 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2261=cut 2312=cut
2262 2313
2263sub deref { 2314sub deref {
2264 my ($ref) = @_; 2315 my ($ref) = @_;
2265 2316
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2318 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2320 or return;
2273 $pl->ob->uuid eq $uuid 2321 $pl->ob->uuid eq $uuid
2274 or return; 2322 or return;
… …
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2494
2447 $self->enter_link; 2495 $self->enter_link;
2448 2496
2449 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2450 my $map = eval { 2519 my $map = eval {
2451 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2452 2521
2453 if ($map) { 2522 if ($map) {
2454 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2456 } else { 2525 } else {
2457 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2458 } 2527 }
2459 2528
2460 $map 2529 $map
2461 }; 2530 };
2462 2531
… …
2552 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2555 2624
2556 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2557 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2558 unless (eval { 2629 unless (eval {
2559 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2560 2631
2561 1; 2632 1;
… …
2598 2669
2599=cut 2670=cut
2600 2671
2601our %CHANNEL = ( 2672our %CHANNEL = (
2602 "c/identify" => { 2673 "c/identify" => {
2603 id => "identify", 2674 id => "infobox",
2604 title => "Identify", 2675 title => "Identify",
2605 reply => undef, 2676 reply => undef,
2606 tooltip => "Items recently identified", 2677 tooltip => "Items recently identified",
2607 }, 2678 },
2608 "c/examine" => { 2679 "c/examine" => {
2609 id => "examine", 2680 id => "infobox",
2610 title => "Examine", 2681 title => "Examine",
2611 reply => undef, 2682 reply => undef,
2612 tooltip => "Signs and other items you examined", 2683 tooltip => "Signs and other items you examined",
2613 }, 2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2614); 2691);
2615 2692
2616sub cf::client::send_msg { 2693sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2695
2619 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2620 2697
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2699
2623 # check predefined channels, for the benefit of C 2700 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2625 2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2626 if (ref $channel) { 2709 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2713 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg; 2714 if $self->can_msg;
… …
2848=pod 2931=pod
2849 2932
2850The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2851 2934
2852 cf::object 2935 cf::object
2853 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2854 insert remove name archname title slaying race decrease_ob_nr 2937 insert remove name archname title slaying race decrease_ob_nr
2855 2938
2856 cf::object::player 2939 cf::object::player
2857 player 2940 player
2858 2941
… …
2865=cut 2948=cut
2866 2949
2867for ( 2950for (
2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race 2952 insert remove inv name archname title slaying race
2870 decrease_ob_nr)], 2953 decrease_ob_nr destroy)],
2871 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2873 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2874) { 2957) {
2875 no strict 'refs'; 2958 no strict 'refs';
… …
3150sub main { 3233sub main {
3151 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
3153 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3154 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
3155 Event::one_event; 3239 Event::one_event;
3156 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
3157 }; 3241 };
3158 3242
3159 reload_config; 3243 reload_config;
… …
3231 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3233 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3321 $pl->save;
3237 } 3322 }
3238 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3239 3324
3240 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
… …
3288 3373
3289 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3290 for (;;) { 3375 for (;;) {
3291 BDB::flush; 3376 BDB::flush;
3292 IO::AIO::flush; 3377 IO::AIO::flush;
3293 Coro::cede; 3378 Coro::cede_notself;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3295 warn "iterate..."; 3380 warn "iterate...";
3296 } 3381 }
3297 3382
3298 ++$RELOAD; 3383 ++$RELOAD;
… …
3403register_command "reload" => sub { 3488register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3405 3490
3406 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3495 reload_perl;
3496 };
3409 } 3497 }
3410}; 3498};
3411 3499
3412unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3413 3501
… …
3432 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3522 $signal->wait;
3435} 3523}
3436 3524
3437 my $min = 1e6;#d#
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3440 reentrant => 0, 3526 reentrant => 0,
3441 parked => 1, 3527 parked => 1,
3442 prio => 0, 3528 prio => 0,
3443 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
… …
3451 3537
3452 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3453 3539
3454 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3455 3541
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; 3542 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3481 3544
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3549 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3487 }; 3551 };
3488 } 3552 }
3489 3553
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3555 $sig->send;
3495 } 3556 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3558 $sig->send;
… …
3507 3568
3508 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3571
3511 _post_tick; 3572 _post_tick;
3512
3513
3514 }, 3573 },
3515); 3574);
3516 3575
3517{ 3576{
3577 BDB::min_parallel 8;
3518 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3519 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3520 reentrant => 0, 3580 reentrant => 0,
3521 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3522 poll => 'r', 3582 poll => 'r',
3523 prio => 0, 3583 prio => 0,
3524 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3526 ); 3586 );
3527 BDB::min_parallel 8;
3528 3587
3529 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3530 my $status; 3589 my $status;
3531 my $current = $Coro::current; 3590 my $current = $Coro::current;
3532 ( 3591 (
… …
3541 ) 3600 )
3542 }; 3601 };
3543 3602
3544 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3545 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3546 3609
3547 cf::sync_job { 3610 cf::sync_job {
3548 eval { 3611 eval {
3549 BDB::db_env_open 3612 BDB::db_env_open
3550 $DB_ENV, 3613 $DB_ENV,
… …
3552 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3617 0666;
3555 3618
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 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 }; 3620 };
3561 3621
3562 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3623 };
3564 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3565} 3656}
3566 3657
3567{ 3658{
3568 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3569 3660
… …
3572 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3573 reentrant => 0, 3664 reentrant => 0,
3574 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3576 poll => 'r', 3667 poll => 'r',
3577 prio => 6, 3668 prio => 0,
3578 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3579 ); 3670 );
3580} 3671}
3581 3672
3582my $_log_backtrace; 3673my $_log_backtrace;
… …
3588 3679
3589 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3682 ++$_log_backtrace;
3592 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3593 my @bt = fork_call { 3686 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3597 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

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