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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.356 by root, Tue Sep 4 05:43:21 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;
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
286 288
287=cut 289=cut
288 290
289our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
290 293
291sub lock_wait($) { 294sub lock_wait($) {
292 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
293 301
294 # wait for lock, if any 302 # wait for lock, if any
295 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 305 Coro::schedule;
… …
303 311
304 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
305 lock_wait $key; 313 lock_wait $key;
306 314
307 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
308 317
309 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
312 } 322 }
313} 323}
314 324
… …
344our @SLOT_QUEUE; 354our @SLOT_QUEUE;
345our $SLOT_QUEUE; 355our $SLOT_QUEUE;
346 356
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
349 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
350 362
351 while () { 363 while () {
352 next_job: 364 next_job:
353 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
361 } 373 }
362 } 374 }
363 } 375 }
364 376
365 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 380 $signal->wait;
369 } else { 381 } else {
370 Coro::schedule; 382 Coro::schedule;
371 } 383 }
… …
415 my $time = Event::time; 427 my $time = Event::time;
416 428
417 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
419 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
420 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 435 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
423 437
424 my $busy = 1; 438 my $busy = 1;
425 my @res; 439 my @res;
426 440
427 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 443 @res = eval { $job->() };
429 warn $@ if $@; 444 warn $@ if $@;
430 undef $busy; 445 undef $busy;
431 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
432 447
… …
500=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
501 516
502Stores 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
503data 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).
504 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
505=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}
506 543
507our $DB; 544our $DB;
508 545
509sub db_init { 546sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 547 cf::sync_job {
514 eval { 548 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 549 };
524} 550}
525 551
526sub db_get($$) { 552sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
528 554
… …
940 966
941=cut 967=cut
942 968
943############################################################################# 969#############################################################################
944# object support 970# object support
945#
946 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#
947sub _can_merge { 1005sub _can_merge {
948 my ($ob1, $ob2) = @_; 1006 my ($ob1, $ob2) = @_;
949 1007
950 local $Storable::canonical = 1; 1008 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1009
954 $fob1 eq $fob2 1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
955} 1012}
956 1013
957sub reattach { 1014sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1016 my ($obj) = @_;
… …
1005); 1062);
1006 1063
1007sub object_freezer_save { 1064sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
1009 1066
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1067 sync_job {
1013 if (length $$rdata) { 1068 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
1016 1072
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1074 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1076 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1077 close $fh;
1022 1078
1023 if (@$objs) { 1079 if (@$objs) {
1024 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) {
1025 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1085 close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1087 }
… …
1040 } else { 1096 } else {
1041 aio_unlink $filename; 1097 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
1043 } 1099 }
1044 }; 1100 };
1045
1046 undef $guard;
1047} 1101}
1048 1102
1049sub object_freezer_as_string { 1103sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
1051 1105
… …
1056 1110
1057sub object_thawer_load { 1111sub object_thawer_load {
1058 my ($filename) = @_; 1112 my ($filename) = @_;
1059 1113
1060 my ($data, $av); 1114 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1115
1064 (aio_load $filename, $data) >= 0 1116 (aio_load $filename, $data) >= 0
1065 or return; 1117 or return;
1066 1118
1067 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1121 or return;
1070 1122
1071 undef $guard; 1123 my $st = eval { Coro::Storable::thaw $av }
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1073 } 1126 }
1074 1127
1128 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
1077 1131
1078 ($data, $av) 1132 ($data, $av)
1079} 1133}
1080 1134
1081=head2 COMMAND CALLBACKS 1135=head2 COMMAND CALLBACKS
… …
1269 1323
1270=head3 cf::player 1324=head3 cf::player
1271 1325
1272=over 4 1326=over 4
1273 1327
1328=item cf::player::num_playing
1329
1330Returns the official number of playing players, as per the Crossfire metaserver rules.
1331
1332=cut
1333
1334sub num_playing {
1335 scalar grep
1336 $_->ob->map
1337 && !$_->hidden
1338 && !$_->ob->flag (cf::FLAG_WIZ),
1339 cf::player::list
1340}
1341
1274=item cf::player::find $login 1342=item cf::player::find $login
1275 1343
1276Returns the given player object, loading it if necessary (might block). 1344Returns the given player object, loading it if necessary (might block).
1277 1345
1278=cut 1346=cut
… …
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1385
1318 my $f = new_from_file cf::object::thawer path $login 1386 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1387 or return;
1320 1388
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1389 my $pl = cf::player::load_pl $f
1323 or return; 1390 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1391 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1392 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
… …
1841sub find { 1908sub find {
1842 my ($path, $origin) = @_; 1909 my ($path, $origin) = @_;
1843 1910
1844 $path = normalise $path, $origin && $origin->path; 1911 $path = normalise $path, $origin && $origin->path;
1845 1912
1913 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1914 cf::lock_wait "map_find:$path";
1847 1915
1848 $cf::MAP{$path} || do { 1916 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1850 my $map = new_from_path cf::map $path 1920 my $map = new_from_path cf::map $path
1851 or return; 1921 or return;
1852 1922
1853 $map->{last_save} = $cf::RUNTIME; 1923 $map->{last_save} = $cf::RUNTIME;
1854 1924
… …
1856 or return; 1926 or return;
1857 1927
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 1929 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 1930 #$cf::WAIT_FOR_TICK->wait;
1931 undef $guard1;
1932 undef $guard2;
1861 $map->reset; 1933 $map->reset;
1862 undef $guard;
1863 return find $path; 1934 return find $path;
1864 } 1935 }
1865 1936
1866 $cf::MAP{$path} = $map 1937 $cf::MAP{$path} = $map
1867 } 1938 }
… …
1876 local $self->{deny_reset} = 1; # loading can take a long time 1947 local $self->{deny_reset} = 1; # loading can take a long time
1877 1948
1878 my $path = $self->{path}; 1949 my $path = $self->{path};
1879 1950
1880 { 1951 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 1952 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 1953
1954 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 1955 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 1956
1886 $self->in_memory (cf::MAP_LOADING); 1957 $self->in_memory (cf::MAP_LOADING);
1887 1958
1888 $self->alloc; 1959 $self->alloc;
1889 1960
… …
2003 } 2074 }
2004 2075
2005 $MAP_PREFETCH{$path} |= $load; 2076 $MAP_PREFETCH{$path} |= $load;
2006 2077
2007 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
2008 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2083 if (my $map = find $k) {
2011 $map->load if $v; 2084 $map->load if $v;
2012 } 2085 }
… …
2038 return if $self->{deny_save}; 2111 return if $self->{deny_save};
2039 2112
2040 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
2041 2114
2042 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
2044 }; 2118 };
2045 2119
2046 if ($uniq) { 2120 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2061 2135
2062 return if $self->players; 2136 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2138 return if $self->{deny_save};
2065 2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2144 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2145}
2069 2146
2070sub reset_at { 2147sub reset_at {
2071 my ($self) = @_; 2148 my ($self) = @_;
2072 2149
… …
2104 if $uniq; 2181 if $uniq;
2105 } 2182 }
2106 2183
2107 delete $cf::MAP{$self->path}; 2184 delete $cf::MAP{$self->path};
2108 2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2188 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2189
2113 $self->unlink_save; 2190 $self->unlink_save;
2114 $self->destroy; 2191 $self->destroy;
2115} 2192}
2116 2193
… …
2231=cut 2308=cut
2232 2309
2233sub deref { 2310sub deref {
2234 my ($ref) = @_; 2311 my ($ref) = @_;
2235 2312
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2314 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2316 or return;
2243 $pl->ob->uuid eq $uuid 2317 $pl->ob->uuid eq $uuid
2244 or return; 2318 or return;
… …
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2490
2417 $self->enter_link; 2491 $self->enter_link;
2418 2492
2419 (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
2420 my $map = eval { 2515 my $map = eval {
2421 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
2422 2517
2423 if ($map) { 2518 if ($map) {
2424 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
2426 } else { 2521 } else {
2427 $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);
2428 } 2523 }
2429 2524
2430 $map 2525 $map
2431 }; 2526 };
2432 2527
… …
2522 # if exit is damned, update players death & WoR home-position 2617 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp) 2618 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED); 2619 if $exit->flag (FLAG_DAMNED);
2525 2620
2526 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2527 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2528 unless (eval { 2625 unless (eval {
2529 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2530 2627
2531 1; 2628 1;
… …
2568 2665
2569=cut 2666=cut
2570 2667
2571our %CHANNEL = ( 2668our %CHANNEL = (
2572 "c/identify" => { 2669 "c/identify" => {
2573 id => "identify", 2670 id => "infobox",
2574 title => "Identify", 2671 title => "Identify",
2575 reply => undef, 2672 reply => undef,
2576 tooltip => "Items recently identified", 2673 tooltip => "Items recently identified",
2577 }, 2674 },
2578 "c/examine" => { 2675 "c/examine" => {
2579 id => "examine", 2676 id => "infobox",
2580 title => "Examine", 2677 title => "Examine",
2581 reply => undef, 2678 reply => undef,
2582 tooltip => "Signs and other items you examined", 2679 tooltip => "Signs and other items you examined",
2583 }, 2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2584); 2687);
2585 2688
2586sub cf::client::send_msg { 2689sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2690 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2691
2589 $msg = $self->pl->expand_cfpod ($msg); 2692 $msg = $self->pl->expand_cfpod ($msg);
2590 2693
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2695
2593 # check predefined channels, for the benefit of C 2696 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2595 2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2596 if (ref $channel) { 2705 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2706 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2707 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2708 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2709 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2710 if $self->can_msg;
… …
2818=pod 2927=pod
2819 2928
2820The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2821 2930
2822 cf::object 2931 cf::object
2823 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
2824 insert remove name archname title slaying race decrease_ob_nr 2933 insert remove name archname title slaying race decrease_ob_nr
2825 2934
2826 cf::object::player 2935 cf::object::player
2827 player 2936 player
2828 2937
… …
2835=cut 2944=cut
2836 2945
2837for ( 2946for (
2838 ["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
2839 insert remove inv name archname title slaying race 2948 insert remove inv name archname title slaying race
2840 decrease_ob_nr)], 2949 decrease_ob_nr destroy)],
2841 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2844) { 2953) {
2845 no strict 'refs'; 2954 no strict 'refs';
… …
3120sub main { 3229sub main {
3121 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
3123 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#
3124 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
3125 Event::one_event; 3235 Event::one_event;
3126 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
3127 }; 3237 };
3128 3238
3129 reload_config; 3239 reload_config;
… …
3201 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3317 $pl->save;
3207 } 3318 }
3208 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
3209 3320
3210 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
… …
3373register_command "reload" => sub { 3484register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
3375 3486
3376 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3491 reload_perl;
3492 };
3379 } 3493 }
3380}; 3494};
3381 3495
3382unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
3383 3497
… …
3402 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3518 $signal->wait;
3405} 3519}
3406 3520
3407 my $min = 1e6;#d#
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
3410 reentrant => 0, 3522 reentrant => 0,
3411 parked => 1, 3523 parked => 1,
3412 prio => 0, 3524 prio => 0,
3413 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
… …
3421 3533
3422 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
3423 3535
3424 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
3425 3537
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
3448
3449 $RUNTIME += $TICK; 3538 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
3451 3540
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
3455 write_runtime 3545 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
3457 }; 3547 };
3458 } 3548 }
3459 3549
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3551 $sig->send;
3465 } 3552 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3554 $sig->send;
… …
3477 3564
3478 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3567
3481 _post_tick; 3568 _post_tick;
3482
3483
3484 }, 3569 },
3485); 3570);
3486 3571
3487{ 3572{
3573 BDB::min_parallel 8;
3488 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
3489 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
3490 reentrant => 0, 3576 reentrant => 0,
3491 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
3492 poll => 'r', 3578 poll => 'r',
3493 prio => 0, 3579 prio => 0,
3494 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
3496 ); 3582 );
3497 BDB::min_parallel 8;
3498 3583
3499 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
3500 my $status; 3585 my $status;
3501 my $current = $Coro::current; 3586 my $current = $Coro::current;
3502 ( 3587 (
… …
3511 ) 3596 )
3512 }; 3597 };
3513 3598
3514 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
3515 $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);
3516 3605
3517 cf::sync_job { 3606 cf::sync_job {
3518 eval { 3607 eval {
3519 BDB::db_env_open 3608 BDB::db_env_open
3520 $DB_ENV, 3609 $DB_ENV,
… …
3522 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
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3613 0666;
3525 3614
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3616 };
3531 3617
3532 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3619 };
3534 } 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 );
3535} 3652}
3536 3653
3537{ 3654{
3538 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
3539 3656
… …
3542 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3543 reentrant => 0, 3660 reentrant => 0,
3544 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3546 poll => 'r', 3663 poll => 'r',
3547 prio => 6, 3664 prio => 0,
3548 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3549 ); 3666 );
3550} 3667}
3551 3668
3552my $_log_backtrace; 3669my $_log_backtrace;
… …
3558 3675
3559 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3678 ++$_log_backtrace;
3562 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3563 my @bt = fork_call { 3682 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 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 |"
3567 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

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