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.411 by root, Fri Feb 1 15:54:07 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 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
196 210
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
213)) { 227)) {
214 no strict 'refs'; 228 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 230}
217 231
218$Event::DIED = sub { 232$EV::DIED = sub {
219 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
220}; 234};
221 235
222############################################################################# 236#############################################################################
223 237
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 261 $d
248 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
249} 263}
250 264
251=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
252 266
253Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
254 268
255=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
256 270
257Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
258 272
259=cut 273=cut
260 274
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 276
263sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
265 279
266=item cf::lock_wait $string 280=item cf::lock_wait $string
267 281
268Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
269 283
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
286 300
287=cut 301=cut
288 302
289our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
290 305
291sub lock_wait($) { 306sub lock_wait($) {
292 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
293 313
294 # wait for lock, if any 314 # wait for lock, if any
295 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 317 Coro::schedule;
… …
303 323
304 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
305 lock_wait $key; 325 lock_wait $key;
306 326
307 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
308 329
309 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
312 } 334 }
313} 335}
314 336
… …
326 }; 348 };
327 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
328 $guard 350 $guard
329} 351}
330 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
331=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
332 369
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds 371This 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. 372of cpu time till the next tick. The slot is only valid till the next cede.
… …
344our @SLOT_QUEUE; 381our @SLOT_QUEUE;
345our $SLOT_QUEUE; 382our $SLOT_QUEUE;
346 383
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
349 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
350 389
351 while () { 390 while () {
352 next_job: 391 next_job:
353 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
361 } 400 }
362 } 401 }
363 } 402 }
364 403
365 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 407 $signal->wait;
369 } else { 408 } else {
370 Coro::schedule; 409 Coro::schedule;
371 } 410 }
… …
394 433
395BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
396 435
397=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
398 437
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 439is 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 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 441acceptable.
403 442
404If it must be done, put the blocking parts into C<sync_job>. This will run 443If 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 444the given BLOCK in another coroutine while waiting for the result. The
… …
410 449
411sub sync_job(&) { 450sub sync_job(&) {
412 my ($job) = @_; 451 my ($job) = @_;
413 452
414 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 454 my $time = EV::time;
416 455
417 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
419 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
420 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 462 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
423 464
424 my $busy = 1; 465 my $busy = 1;
425 my @res; 466 my @res;
426 467
427 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 470 @res = eval { $job->() };
429 warn $@ if $@; 471 warn $@ if $@;
430 undef $busy; 472 undef $busy;
431 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
432 474
433 while ($busy) { 475 while ($busy) {
434 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
435 } 480 }
481 }
436 482
437 $time = Event::time - $time; 483 $time = EV::time - $time;
438 484
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441 487
442 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
472=item fork_call { }, $args 518=item fork_call { }, $args
473 519
474Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
478 524
479=cut 525=cut
480 526
481sub fork_call(&@) { 527sub fork_call(&@) {
482 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
… …
500=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
501 547
502Stores the given C<$value> in the family. It can currently store binary 548Stores 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). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
505=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
506 574
507our $DB; 575our $DB;
508 576
509sub db_init { 577sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 578 cf::sync_job {
514 eval { 579 $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 } 580 };
524} 581}
525 582
526sub db_get($$) { 583sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
528 585
… …
632attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
634 691
635In the following description, CLASS can be any of C<global>, C<object> 692In 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 693C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 694Deliantra).
638 695
639=over 4 696=over 4
640 697
641=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
642 699
… …
924 } 981 }
925 982
926 0 983 0
927} 984}
928 985
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 987
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 989
933Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
934 991
… …
940 997
941=cut 998=cut
942 999
943############################################################################# 1000#############################################################################
944# object support 1001# object support
945#
946 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
947sub _can_merge { 1036sub _can_merge {
948 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
949 1038
950 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1040
954 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
955} 1043}
956 1044
957sub reattach { 1045sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1047 my ($obj) = @_;
… …
981cf::attachable->attach ( 1069cf::attachable->attach (
982 prio => -1000000, 1070 prio => -1000000,
983 on_instantiate => sub { 1071 on_instantiate => sub {
984 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
985 1073
986 $data = from_json $data; 1074 $data = decode_json $data;
987 1075
988 for (@$data) { 1076 for (@$data) {
989 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
990 1078
991 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1005); 1093);
1006 1094
1007sub object_freezer_save { 1095sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1009 1097
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1098 sync_job {
1013 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1016 1103
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1108 close $fh;
1022 1109
1023 if (@$objs) { 1110 if (@$objs) {
1024 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1025 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1116 close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1118 }
… …
1040 } else { 1127 } else {
1041 aio_unlink $filename; 1128 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1043 } 1130 }
1044 }; 1131 };
1045
1046 undef $guard;
1047} 1132}
1048 1133
1049sub object_freezer_as_string { 1134sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1051 1136
… …
1056 1141
1057sub object_thawer_load { 1142sub object_thawer_load {
1058 my ($filename) = @_; 1143 my ($filename) = @_;
1059 1144
1060 my ($data, $av); 1145 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1146
1064 (aio_load $filename, $data) >= 0 1147 (aio_load $filename, $data) >= 0
1065 or return; 1148 or return;
1066 1149
1067 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1152 or return;
1070 1153
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1073 } 1156 }
1074 1157
1158 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1077 1161
1078 ($data, $av) 1162 ($data, $av)
1079} 1163}
1080 1164
1081=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
… …
1232 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1234 1318
1235 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1236 warn $msg; 1320 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1238 exit 1;
1239 } 1322 }
1240 1323
1241 warn $msg; 1324 warn $msg;
1242 } 1325 }
1243 1326
… …
1268use Coro::AIO; 1351use Coro::AIO;
1269 1352
1270=head3 cf::player 1353=head3 cf::player
1271 1354
1272=over 4 1355=over 4
1356
1357=item cf::player::num_playing
1358
1359Returns the official number of playing players, as per the Crossfire metaserver rules.
1360
1361=cut
1362
1363sub num_playing {
1364 scalar grep
1365 $_->ob->map
1366 && !$_->hidden
1367 && !$_->ob->flag (cf::FLAG_WIZ),
1368 cf::player::list
1369}
1273 1370
1274=item cf::player::find $login 1371=item cf::player::find $login
1275 1372
1276Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1277 1374
… …
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1414
1318 my $f = new_from_file cf::object::thawer path $login 1415 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1416 or return;
1320 1417
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1418 my $pl = cf::player::load_pl $f
1323 or return; 1419 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1420 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1421 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
… …
1478 1574
1479Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1480 1576
1481=cut 1577=cut
1482 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1483sub expand_cfpod { 1590sub expand_cfpod {
1484 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1485 1592
1486 # escape & and < 1593 my $xml;
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489 1594
1490 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1491 1598
1492 1 while 1599 $group =~ s/&/&amp;/g;
1493 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1494 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1495 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1496 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1498 # replace G<male|female> tags 1605 <
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1500 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1501 }ge 1608 | < $interior >
1502 # replace H<hint text> 1609 )
1503 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1504 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1632 "")
1508 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1510 1644
1645 for ($xml) {
1511 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1513 1648
1514 # compress some whitespace 1649 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1519 1655
1520 $_ 1656 $xml
1521} 1657}
1658
1659no re 'eval';
1522 1660
1523sub hintmode { 1661sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1663 $_[0]{hintmode}
1526} 1664}
… …
1841sub find { 1979sub find {
1842 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1843 1981
1844 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1845 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1847 1986
1848 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1850 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1851 or return; 1992 or return;
1852 1993
1853 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1854 1995
… …
1856 or return; 1997 or return;
1857 1998
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1861 $map->reset; 2004 $map->reset;
1862 undef $guard;
1863 return find $path; 2005 return find $path;
1864 } 2006 }
1865 2007
1866 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1867 } 2009 }
… …
1876 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1877 2019
1878 my $path = $self->{path}; 2020 my $path = $self->{path};
1879 2021
1880 { 2022 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 2024
2025 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2027
1886 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1887 2029
1888 $self->alloc; 2030 $self->alloc;
1889 2031
… …
2003 } 2145 }
2004 2146
2005 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2006 2148
2007 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2008 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2154 if (my $map = find $k) {
2011 $map->load if $v; 2155 $map->load if $v;
2012 } 2156 }
… …
2038 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2039 2183
2040 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2041 2185
2042 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2044 }; 2189 };
2045 2190
2046 if ($uniq) { 2191 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2061 2206
2062 return if $self->players; 2207 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2209 return if $self->{deny_save};
2065 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2215 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2216}
2069 2217
2070sub reset_at { 2218sub reset_at {
2071 my ($self) = @_; 2219 my ($self) = @_;
2072 2220
… …
2104 if $uniq; 2252 if $uniq;
2105 } 2253 }
2106 2254
2107 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
2108 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2259 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2260
2113 $self->unlink_save; 2261 $self->unlink_save;
2114 $self->destroy; 2262 $self->destroy;
2115} 2263}
2116 2264
… …
2231=cut 2379=cut
2232 2380
2233sub deref { 2381sub deref {
2234 my ($ref) = @_; 2382 my ($ref) = @_;
2235 2383
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2385 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2387 or return;
2243 $pl->ob->uuid eq $uuid 2388 $pl->ob->uuid eq $uuid
2244 or return; 2389 or return;
… …
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2561
2417 $self->enter_link; 2562 $self->enter_link;
2418 2563
2419 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2567 # *tag paths override both path and x|y
2568 if ($path =~ /^\*(.*)$/) {
2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2570 my $ob = $obs[rand @obs];
2571
2572 # see if we actually can go there
2573 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2574 $ob = $obs[rand @obs];
2575 } else {
2576 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2577 }
2578 # else put us there anyways for now #d#
2579
2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2583 }
2584 }
2585
2420 my $map = eval { 2586 my $map = eval {
2421 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2422 2588
2423 if ($map) { 2589 if ($map) {
2424 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2426 } else { 2592 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2594 }
2429 2595
2430 $map 2596 $map
2431 }; 2597 };
2432 2598
… …
2485 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2486 } 2652 }
2487 2653
2488 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2489 2655
2490 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2491 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2493 2659
2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2522 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2525 2691
2526 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2527 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2528 unless (eval { 2696 unless (eval {
2529 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2530 2698
2531 1; 2699 1;
… …
2566the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2568 2736
2569=cut 2737=cut
2570 2738
2739# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2740our %CHANNEL = (
2572 "c/identify" => { 2741 "c/identify" => {
2573 id => "identify", 2742 id => "infobox",
2574 title => "Identify", 2743 title => "Identify",
2575 reply => undef, 2744 reply => undef,
2576 tooltip => "Items recently identified", 2745 tooltip => "Items recently identified",
2577 }, 2746 },
2578 "c/examine" => { 2747 "c/examine" => {
2579 id => "examine", 2748 id => "infobox",
2580 title => "Examine", 2749 title => "Examine",
2581 reply => undef, 2750 reply => undef,
2582 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2583 }, 2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2584); 2789);
2585 2790
2586sub cf::client::send_msg { 2791sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2793
2589 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2590 2795
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2797
2593 # check predefined channels, for the benefit of C 2798 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2595 2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2596 if (ref $channel) { 2807 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2811 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2812 if $self->can_msg;
… …
2818=pod 3029=pod
2819 3030
2820The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2821 3032
2822 cf::object 3033 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 3035 insert remove name archname title slaying race decrease_ob_nr
2825 3036
2826 cf::object::player 3037 cf::object::player
2827 player 3038 player
2828 3039
… …
2835=cut 3046=cut
2836 3047
2837for ( 3048for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 3050 insert remove inv name archname title slaying race
2840 decrease_ob_nr)], 3051 decrease_ob_nr destroy)],
2841 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2844) { 3055) {
2845 no strict 'refs'; 3056 no strict 'refs';
… …
2950 { 3161 {
2951 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2952 3163
2953 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2954 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2955 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3169 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}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2959 3171
2960 cf::cede_to_tick; 3172 cf::cede_to_tick;
2961 } 3173 }
2962 3174
2963 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2964 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2965 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2966 or next; 3179 or next;
3180
2967 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970 } else { 3184 } else {
2971 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2989 { 3203 {
2990 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
2993 3207
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data; 3211 my $data;
2999 3212
3000 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
3001 # prepend meta info 3214 # prepend meta info
3002 3215
3003 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
3004 name => $name, 3217 name => $name,
3005 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
3006 }); 3219 });
3007 3220
3008 $data = pack "(w/a*)*", $meta, $info->{data}; 3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
3009 } else { 3228 } else {
3010 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
3011 } 3230 }
3012 3231
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; 3232 cf::cede_to_tick;
3017 } 3233 }
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 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3037 3237
3038 1 3238 1
3039} 3239}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3040 3260
3041register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
3043 3263
3044 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
… …
3099sub reload_config { 3319sub reload_config {
3100 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3101 or return; 3321 or return;
3102 3322
3103 local $/; 3323 local $/;
3104 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3105 3325
3106 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3107 3327
3108 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $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}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3120sub main { 3340sub main {
3121 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3344 (async {
3125 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
3126 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3127 }; 3348 };
3128 3349
3129 reload_config; 3350 reload_config;
3130 db_init; 3351 db_init;
3131 load_extensions; 3352 load_extensions;
3132 3353
3133 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3134 Event::loop; 3356 EV::loop;
3135} 3357}
3136 3358
3137############################################################################# 3359#############################################################################
3138# initialisation and cleanup 3360# initialisation and cleanup
3139 3361
3140# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3141BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3142 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3143 Event->signal ( 3366 $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"; 3367 cf::cleanup "SIG$signal";
3150 },
3151 ); 3368 };
3152 } 3369 }
3153} 3370}
3154 3371
3155sub write_runtime { 3372sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3201 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3424 $pl->save;
3207 } 3425 }
3208 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3209 3427
3210 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3249 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3250 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3251 3469
3252 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
3253 3471
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"; 3472 warn "flushing outstanding aio requests";
3260 for (;;) { 3473 for (;;) {
3261 BDB::flush; 3474 BDB::flush;
3262 IO::AIO::flush; 3475 IO::AIO::flush;
3263 Coro::cede; 3476 Coro::cede_notself;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate..."; 3478 warn "iterate...";
3266 } 3479 }
3267 3480
3268 ++$RELOAD; 3481 ++$RELOAD;
… …
3344 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3345 3558
3346 1 3559 1
3347 } or do { 3560 } or do {
3348 warn $@; 3561 warn $@;
3349 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3350 exit 1;
3351 }; 3563 };
3352 3564
3353 warn "reloaded"; 3565 warn "reloaded";
3354}; 3566};
3355 3567
… …
3357 3569
3358sub reload_perl() { 3570sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3361 3573
3362 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3363 reentrant => 0,
3364 after => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => sub {
3367 do_reload_perl; 3575 do_reload_perl;
3368 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3369 },
3370 ); 3577 };
3371} 3578}
3372 3579
3373register_command "reload" => sub { 3580register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3375 3582
3376 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3587 reload_perl;
3588 };
3379 } 3589 }
3380}; 3590};
3381 3591
3382unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3383 3593
… …
3402 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3614 $signal->wait;
3405} 3615}
3406 3616
3407 my $min = 1e6;#d# 3617$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) { 3618 if ($Coro::current != $Coro::main) {
3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3419 return; 3621 return;
3420 } 3622 }
3421 3623
3422 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3423 3625
3424 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3425 3627
3426 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3427 for(1..10) { 3629 $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 3630
3432 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3433 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3434 $map->alloc; 3633 Coro::async_pool {
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3634 $Coro::current->{desc} = "runtime saver";
3436 my $t = Event::time - $t; 3635 write_runtime
3437 3636 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 }; 3637 };
3638 }
3448 3639
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) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3641 $sig->send;
3465 } 3642 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3644 $sig->send;
3468 } 3645 }
3469 3646
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; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3649
3481 _post_tick; 3650 _post_tick;
3482 3651};
3483 3652$TICK_WATCHER->priority (EV::MAXPRI);
3484 },
3485);
3486 3653
3487{ 3654{
3488 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3489 $BDB_POLL_WATCHER = Event->io ( 3656
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; 3657 BDB::min_parallel 8;
3498 3658 BDB::max_poll_reqs $TICK * 0.1;
3499 BDB::set_sync_prepare { 3659 $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 3660
3514 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3664 | BDB::LOG_AUTOREMOVE, 1);
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3667
3517 cf::sync_job { 3668 cf::sync_job {
3518 eval { 3669 eval {
3519 BDB::db_env_open 3670 BDB::db_env_open
3520 $DB_ENV, 3671 $DB_ENV,
… …
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3673 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3675 0666;
3525 3676
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 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 }; 3678 };
3531 3679
3532 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3681 };
3534 } 3682 }
3683
3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3686 };
3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3689 };
3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3692 };
3535} 3693}
3536 3694
3537{ 3695{
3696 # configure IO::AIO
3697
3538 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3539
3540 undef $Coro::AIO::WATCHER;
3541 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3542 $AIO_POLL_WATCHER = Event->io ( 3700 $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} 3701}
3551 3702
3552my $_log_backtrace; 3703my $_log_backtrace;
3553 3704
3554sub _log_backtrace { 3705sub _log_backtrace {
… …
3558 3709
3559 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3712 ++$_log_backtrace;
3562 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3563 my @bt = fork_call { 3716 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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