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

Diff Legend

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