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.406 by root, Mon Dec 17 08:27:44 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use 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.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
75 75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
83 82
84our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 87our $DB_ENV;
86 88
87our %CFG; 89our %CFG;
88 90
89our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 92our $RUNTIME;
93our $NOW;
91 94
92our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
… …
159 162
160The raw value load value from the last tick. 163The raw value load value from the last tick.
161 164
162=item %cf::CFG 165=item %cf::CFG
163 166
164Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 168from wherever your confdir points to.
166 169
167=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
168 171
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
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';
… …
213)) { 215)) {
214 no strict 'refs'; 216 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 218}
217 219
218$Event::DIED = sub { 220$EV::DIED = sub {
219 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
220}; 222};
221 223
222############################################################################# 224#############################################################################
223 225
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 249 $d
248 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
249} 251}
250 252
251=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
252 254
253Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
254 256
255=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
256 258
257Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
258 260
259=cut 261=cut
260 262
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 264
263sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
265 267
266=item cf::lock_wait $string 268=item cf::lock_wait $string
267 269
268Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
269 271
… …
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
… …
326 }; 336 };
327 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
328 $guard 338 $guard
329} 339}
330 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
331=item cf::get_slot $time[, $priority[, $name]] 356=item cf::get_slot $time[, $priority[, $name]]
332 357
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 358Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds 359This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede. 360of cpu time till the next tick. The slot is only valid till the next cede.
… …
344our @SLOT_QUEUE; 369our @SLOT_QUEUE;
345our $SLOT_QUEUE; 370our $SLOT_QUEUE;
346 371
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
349 my $signal = new Coro::Signal; 376 my $signal = new Coro::Signal;
350 377
351 while () { 378 while () {
352 next_job: 379 next_job:
353 my $avail = cf::till_tick; 380 my $avail = cf::till_tick;
… …
361 } 388 }
362 } 389 }
363 } 390 }
364 391
365 if (@SLOT_QUEUE) { 392 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 394 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 395 $signal->wait;
369 } else { 396 } else {
370 Coro::schedule; 397 Coro::schedule;
371 } 398 }
… …
394 421
395BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
396 423
397=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
398 425
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 429acceptable.
403 430
404If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
… …
410 437
411sub sync_job(&) { 438sub sync_job(&) {
412 my ($job) = @_; 439 my ($job) = @_;
413 440
414 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 442 my $time = EV::time;
416 443
417 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
419 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
420 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 450 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
423 452
424 my $busy = 1; 453 my $busy = 1;
425 my @res; 454 my @res;
426 455
427 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 458 @res = eval { $job->() };
429 warn $@ if $@; 459 warn $@ if $@;
430 undef $busy; 460 undef $busy;
431 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
432 462
433 while ($busy) { 463 while ($busy) {
434 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
435 } 468 }
469 }
436 470
437 $time = Event::time - $time; 471 $time = EV::time - $time;
438 472
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441 475
442 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
… …
472=item fork_call { }, $args 506=item fork_call { }, $args
473 507
474Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
478 512
479=cut 513=cut
480 514
481sub fork_call(&@) { 515sub fork_call(&@) {
482 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
… …
500=item cf::db_put $family => $key => $value 534=item cf::db_put $family => $key => $value
501 535
502Stores the given C<$value> in the family. It can currently store binary 536Stores 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). 537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 538
539=item $db = cf::db_table "name"
540
541Create and/or open a new database table. The string must not be "db" and must be unique
542within each server.
543
505=cut 544=cut
545
546sub db_table($) {
547 my ($name) = @_;
548 my $db = BDB::db_create $DB_ENV;
549
550 eval {
551 $db->set_flags (BDB::CHKSUM);
552
553 utf8::encode $name;
554 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
555 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
556 cf::cleanup "db_open(db): $!" if $!;
557 };
558 cf::cleanup "db_open(db): $@" if $@;
559
560 $db
561}
506 562
507our $DB; 563our $DB;
508 564
509sub db_init { 565sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 566 cf::sync_job {
514 eval { 567 $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 } 568 };
524} 569}
525 570
526sub db_get($$) { 571sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 572 my $key = "$_[0]/$_[1]";
528 573
… …
632attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
634 679
635In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 682Deliantra).
638 683
639=over 4 684=over 4
640 685
641=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
642 687
… …
924 } 969 }
925 970
926 0 971 0
927} 972}
928 973
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 975
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 977
933Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
934 979
… …
940 985
941=cut 986=cut
942 987
943############################################################################# 988#############################################################################
944# object support 989# object support
945#
946 990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
947sub _can_merge { 1024sub _can_merge {
948 my ($ob1, $ob2) = @_; 1025 my ($ob1, $ob2) = @_;
949 1026
950 local $Storable::canonical = 1; 1027 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1028
954 $fob1 eq $fob2 1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
955} 1031}
956 1032
957sub reattach { 1033sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1035 my ($obj) = @_;
… …
981cf::attachable->attach ( 1057cf::attachable->attach (
982 prio => -1000000, 1058 prio => -1000000,
983 on_instantiate => sub { 1059 on_instantiate => sub {
984 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
985 1061
986 $data = from_json $data; 1062 $data = decode_json $data;
987 1063
988 for (@$data) { 1064 for (@$data) {
989 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
990 1066
991 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
… …
1005); 1081);
1006 1082
1007sub object_freezer_save { 1083sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
1009 1085
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1086 sync_job {
1013 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
1016 1091
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1096 close $fh;
1022 1097
1023 if (@$objs) { 1098 if (@$objs) {
1024 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1025 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1104 close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1106 }
… …
1040 } else { 1115 } else {
1041 aio_unlink $filename; 1116 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
1043 } 1118 }
1044 }; 1119 };
1045
1046 undef $guard;
1047} 1120}
1048 1121
1049sub object_freezer_as_string { 1122sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
1051 1124
… …
1056 1129
1057sub object_thawer_load { 1130sub object_thawer_load {
1058 my ($filename) = @_; 1131 my ($filename) = @_;
1059 1132
1060 my ($data, $av); 1133 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1134
1064 (aio_load $filename, $data) >= 0 1135 (aio_load $filename, $data) >= 0
1065 or return; 1136 or return;
1066 1137
1067 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1140 or return;
1070 1141
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1073 } 1144 }
1074 1145
1146 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1077 1149
1078 ($data, $av) 1150 ($data, $av)
1079} 1151}
1080 1152
1081=head2 COMMAND CALLBACKS 1153=head2 COMMAND CALLBACKS
… …
1269 1341
1270=head3 cf::player 1342=head3 cf::player
1271 1343
1272=over 4 1344=over 4
1273 1345
1346=item cf::player::num_playing
1347
1348Returns the official number of playing players, as per the Crossfire metaserver rules.
1349
1350=cut
1351
1352sub num_playing {
1353 scalar grep
1354 $_->ob->map
1355 && !$_->hidden
1356 && !$_->ob->flag (cf::FLAG_WIZ),
1357 cf::player::list
1358}
1359
1274=item cf::player::find $login 1360=item cf::player::find $login
1275 1361
1276Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
1277 1363
1278=cut 1364=cut
… …
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1403
1318 my $f = new_from_file cf::object::thawer path $login 1404 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1405 or return;
1320 1406
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1407 my $pl = cf::player::load_pl $f
1323 or return; 1408 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1409 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1410 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
… …
1478 1563
1479Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1480 1565
1481=cut 1566=cut
1482 1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1483sub expand_cfpod { 1579sub expand_cfpod {
1484 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1485 1581
1486 # escape & and < 1582 my $xml;
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489 1583
1490 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1491 1587
1492 1 while 1588 $group =~ s/&/&amp;/g;
1493 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1494 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1495 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1496 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1593 ([BCGHITU])
1498 # replace G<male|female> tags 1594 <
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1595 (?:
1500 $self->gender ? $2 : $1 1596 ([^<>]*) (?{ $group = $^N })
1501 }ge 1597 | < $interior >
1502 # replace H<hint text> 1598 )
1503 || s{H<([^\>]*)>} 1599 >
1600 %gcsx
1504 { 1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1621 "")
1508 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1510 1633
1634 for ($xml) {
1511 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1513 1637
1514 # compress some whitespace 1638 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1519 1644
1520 $_ 1645 $xml
1521} 1646}
1647
1648no re 'eval';
1522 1649
1523sub hintmode { 1650sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1652 $_[0]{hintmode}
1526} 1653}
… …
1841sub find { 1968sub find {
1842 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1843 1970
1844 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1845 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1847 1975
1848 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1850 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1851 or return; 1981 or return;
1852 1982
1853 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1854 1984
… …
1856 or return; 1986 or return;
1857 1987
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1861 $map->reset; 1993 $map->reset;
1862 undef $guard;
1863 return find $path; 1994 return find $path;
1864 } 1995 }
1865 1996
1866 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1867 } 1998 }
… …
1876 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1877 2008
1878 my $path = $self->{path}; 2009 my $path = $self->{path};
1879 2010
1880 { 2011 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 2013
2014 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2016
1886 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1887 2018
1888 $self->alloc; 2019 $self->alloc;
1889 2020
… …
2003 } 2134 }
2004 2135
2005 $MAP_PREFETCH{$path} |= $load; 2136 $MAP_PREFETCH{$path} |= $load;
2006 2137
2007 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
2008 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2143 if (my $map = find $k) {
2011 $map->load if $v; 2144 $map->load if $v;
2012 } 2145 }
… …
2038 return if $self->{deny_save}; 2171 return if $self->{deny_save};
2039 2172
2040 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
2041 2174
2042 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
2044 }; 2178 };
2045 2179
2046 if ($uniq) { 2180 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2061 2195
2062 return if $self->players; 2196 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2198 return if $self->{deny_save};
2065 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2204 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2205}
2069 2206
2070sub reset_at { 2207sub reset_at {
2071 my ($self) = @_; 2208 my ($self) = @_;
2072 2209
… …
2104 if $uniq; 2241 if $uniq;
2105 } 2242 }
2106 2243
2107 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2108 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2248 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2249
2113 $self->unlink_save; 2250 $self->unlink_save;
2114 $self->destroy; 2251 $self->destroy;
2115} 2252}
2116 2253
… …
2231=cut 2368=cut
2232 2369
2233sub deref { 2370sub deref {
2234 my ($ref) = @_; 2371 my ($ref) = @_;
2235 2372
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2374 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2376 or return;
2243 $pl->ob->uuid eq $uuid 2377 $pl->ob->uuid eq $uuid
2244 or return; 2378 or return;
… …
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2550
2417 $self->enter_link; 2551 $self->enter_link;
2418 2552
2419 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2556 # *tag paths override both path and x|y
2557 if ($path =~ /^\*(.*)$/) {
2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2559 my $ob = $obs[rand @obs];
2560
2561 # see if we actually can go there
2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2568
2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2572 }
2573 }
2574
2420 my $map = eval { 2575 my $map = eval {
2421 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2422 2577
2423 if ($map) { 2578 if ($map) {
2424 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2426 } else { 2581 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2583 }
2429 2584
2430 $map 2585 $map
2431 }; 2586 };
2432 2587
… …
2485 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2486 } 2641 }
2487 2642
2488 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2489 2644
2490 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2491 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2493 2648
2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
… …
2522 # if exit is damned, update players death & WoR home-position 2677 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp) 2678 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED); 2679 if $exit->flag (FLAG_DAMNED);
2525 2680
2526 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2527 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2528 unless (eval { 2685 unless (eval {
2529 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2530 2687
2531 1; 2688 1;
… …
2566the message, with C<log> being the default. If C<$color> is negative, suppress 2723the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2568 2725
2569=cut 2726=cut
2570 2727
2728# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2729our %CHANNEL = (
2572 "c/identify" => { 2730 "c/identify" => {
2573 id => "identify", 2731 id => "infobox",
2574 title => "Identify", 2732 title => "Identify",
2575 reply => undef, 2733 reply => undef,
2576 tooltip => "Items recently identified", 2734 tooltip => "Items recently identified",
2577 }, 2735 },
2578 "c/examine" => { 2736 "c/examine" => {
2579 id => "examine", 2737 id => "infobox",
2580 title => "Examine", 2738 title => "Examine",
2581 reply => undef, 2739 reply => undef,
2582 tooltip => "Signs and other items you examined", 2740 tooltip => "Signs and other items you examined",
2583 }, 2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2777 },
2584); 2778);
2585 2779
2586sub cf::client::send_msg { 2780sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2782
2589 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2590 2784
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2786
2593 # check predefined channels, for the benefit of C 2787 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2595 2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2596 if (ref $channel) { 2796 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2797 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2798 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2799 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2800 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2801 if $self->can_msg;
… …
2818=pod 3018=pod
2819 3019
2820The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2821 3021
2822 cf::object 3022 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 3023 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 3024 insert remove name archname title slaying race decrease_ob_nr
2825 3025
2826 cf::object::player 3026 cf::object::player
2827 player 3027 player
2828 3028
… …
2835=cut 3035=cut
2836 3036
2837for ( 3037for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 3039 insert remove inv name archname title slaying race
2840 decrease_ob_nr)], 3040 decrease_ob_nr destroy)],
2841 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2844) { 3044) {
2845 no strict 'refs'; 3045 no strict 'refs';
… …
2950 { 3150 {
2951 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2952 3152
2953 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2954 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2955 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2959 3160
2960 cf::cede_to_tick; 3161 cf::cede_to_tick;
2961 } 3162 }
2962 3163
2963 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2964 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2965 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2966 or next; 3168 or next;
3169
2967 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970 } else { 3173 } else {
2971 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2989 { 3192 {
2990 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
2993 3196
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data; 3200 my $data;
2999 3201
3000 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3001 # prepend meta info 3203 # prepend meta info
3002 3204
3003 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3004 name => $name, 3206 name => $name,
3005 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3006 }); 3208 });
3007 3209
3008 $data = pack "(w/a*)*", $meta, $info->{data}; 3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3009 } else { 3217 } else {
3010 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3011 } 3219 }
3012 3220
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick; 3221 cf::cede_to_tick;
3017 } 3222 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 } 3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3037 3226
3038 1 3227 1
3039} 3228}
3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3040 3249
3041register_exticmd fx_want => sub { 3250register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_; 3251 my ($ns, $want) = @_;
3043 3252
3044 while (my ($k, $v) = each %$want) { 3253 while (my ($k, $v) = each %$want) {
… …
3120sub main { 3329sub main {
3121 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3333 (async {
3125 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
3126 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
3127 }; 3337 };
3128 3338
3129 reload_config; 3339 reload_config;
3130 db_init; 3340 db_init;
3131 load_extensions; 3341 load_extensions;
3132 3342
3133 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3134 Event::loop; 3345 EV::loop;
3135} 3346}
3136 3347
3137############################################################################# 3348#############################################################################
3138# initialisation and cleanup 3349# initialisation and cleanup
3139 3350
3140# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
3141BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
3142 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
3143 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3144 reentrant => 0,
3145 data => WF_AUTOCANCEL,
3146 signal => $signal,
3147 prio => 0,
3148 cb => sub {
3149 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
3150 },
3151 ); 3357 };
3152 } 3358 }
3153} 3359}
3154 3360
3155sub write_runtime { 3361sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
… …
3201 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3413 $pl->save;
3207 } 3414 }
3208 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
3209 3416
3210 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
… …
3249 warn "syncing database to disk"; 3456 warn "syncing database to disk";
3250 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
3251 3458
3252 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
3253 3460
3254 warn "cancelling all WF_AUTOCANCEL watchers";
3255 for (Event::all_watchers) {
3256 $_->cancel if $_->data & WF_AUTOCANCEL;
3257 }
3258
3259 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
3260 for (;;) { 3462 for (;;) {
3261 BDB::flush; 3463 BDB::flush;
3262 IO::AIO::flush; 3464 IO::AIO::flush;
3263 Coro::cede; 3465 Coro::cede_notself;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate..."; 3467 warn "iterate...";
3266 } 3468 }
3267 3469
3268 ++$RELOAD; 3470 ++$RELOAD;
… …
3357 3559
3358sub reload_perl() { 3560sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3361 3563
3362 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3363 reentrant => 0,
3364 after => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => sub {
3367 do_reload_perl;
3368 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3369 }, 3566 do_reload_perl;
3370 ); 3567 };
3371} 3568}
3372 3569
3373register_command "reload" => sub { 3570register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3375 3572
3376 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3577 reload_perl;
3578 };
3379 } 3579 }
3380}; 3580};
3381 3581
3382unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
3383 3583
… …
3402 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3604 $signal->wait;
3405} 3605}
3406 3606
3407 my $min = 1e6;#d# 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer (
3410 reentrant => 0,
3411 parked => 1,
3412 prio => 0,
3413 at => $NEXT_TICK || $TICK,
3414 data => WF_AUTOCANCEL,
3415 cb => sub {
3416 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3419 return; 3611 return;
3420 } 3612 }
3421 3613
3422 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3423 3615
3424 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3425 3617
3426 0 && sync_job {#d# 3618 $RUNTIME += $TICK;
3427 for(1..10) { 3619 $NEXT_TICK = $_[0]->at;
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431 3620
3432 $map->width (50); 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3433 $map->height (50); 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3434 $map->alloc; 3623 Coro::async_pool {
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3624 $Coro::current->{desc} = "runtime saver";
3436 my $t = Event::time - $t; 3625 write_runtime
3437 3626 or warn "ERROR: unable to write runtime file: $!";
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 }; 3627 };
3628 }
3448 3629
3449 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK;
3451
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool {
3455 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!";
3457 };
3458 }
3459
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3631 $sig->send;
3465 } 3632 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3634 $sig->send;
3468 } 3635 }
3469 3636
3470 $NOW = Event::time;
3471
3472 # if we are delayed by four ticks or more, skip them all
3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3474
3475 $TICK_WATCHER->at ($NEXT_TICK);
3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3639
3481 _post_tick; 3640 _post_tick;
3482 3641};
3483 3642$TICK_WATCHER->priority (EV::MAXPRI);
3484 },
3485);
3486 3643
3487{ 3644{
3488 BDB::max_poll_time $TICK * 0.1; 3645 # configure BDB
3489 $BDB_POLL_WATCHER = Event->io ( 3646
3490 reentrant => 0,
3491 fd => BDB::poll_fileno,
3492 poll => 'r',
3493 prio => 0,
3494 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb,
3496 );
3497 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3498 3648 BDB::max_poll_reqs $TICK * 0.1;
3499 BDB::set_sync_prepare { 3649 $Coro::BDB::WATCHER->priority (1);
3500 my $status;
3501 my $current = $Coro::current;
3502 (
3503 sub {
3504 $status = $!;
3505 $current->ready; undef $current;
3506 },
3507 sub {
3508 Coro::schedule while defined $current;
3509 $! = $status;
3510 },
3511 )
3512 };
3513 3650
3514 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3654 | BDB::LOG_AUTOREMOVE, 1);
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3657
3517 cf::sync_job { 3658 cf::sync_job {
3518 eval { 3659 eval {
3519 BDB::db_env_open 3660 BDB::db_env_open
3520 $DB_ENV, 3661 $DB_ENV,
… …
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3663 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3665 0666;
3525 3666
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 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 }; 3668 };
3531 3669
3532 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3671 };
3534 } 3672 }
3673
3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3676 };
3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3679 };
3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3682 };
3535} 3683}
3536 3684
3537{ 3685{
3686 # configure IO::AIO
3687
3538 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3539
3540 undef $Coro::AIO::WATCHER;
3541 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3542 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3543 reentrant => 0,
3544 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno,
3546 poll => 'r',
3547 prio => 6,
3548 cb => \&IO::AIO::poll_cb,
3549 );
3550} 3691}
3551 3692
3552my $_log_backtrace; 3693my $_log_backtrace;
3553 3694
3554sub _log_backtrace { 3695sub _log_backtrace {
… …
3558 3699
3559 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3702 ++$_log_backtrace;
3562 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3563 my @bt = fork_call { 3706 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3709 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

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