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.365 by root, Tue Sep 11 13:27:56 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;
85our $BDB_CHECKPOINT_WATCHER; 82our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 83our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 84our $DB_ENV;
88 85
89our %CFG; 86our %CFG;
90 87
91our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 89our $RUNTIME;
90our $NOW;
93 91
94our (%PLAYER, %PLAYER_LOADING); # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 93our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
97 95
… …
161 159
162The raw value load value from the last tick. 160The raw value load value from the last tick.
163 161
164=item %cf::CFG 162=item %cf::CFG
165 163
166Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 165from wherever your confdir points to.
168 166
169=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
170 168
171These 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
… …
192 $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;
193 191
194 LOG llevError, $msg; 192 LOG llevError, $msg;
195 }; 193 };
196} 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#?
197 210
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
214)) { 227)) {
215 no strict 'refs'; 228 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 230}
218 231
219$Event::DIED = sub { 232$EV::DIED = sub {
220 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
221}; 234};
222 235
223############################################################################# 236#############################################################################
224 237
… …
247 $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;
248 $d 261 $d
249 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
250} 263}
251 264
252=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
253 266
254Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
255 268
256=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
257 270
258Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
259 272
260=cut 273=cut
261 274
262our $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
263 276
264sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
266 279
267=item cf::lock_wait $string 280=item cf::lock_wait $string
268 281
269Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
270 283
… …
335 }; 348 };
336 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
337 $guard 350 $guard
338} 351}
339 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
340=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
341 369
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This 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
344of 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.
… …
353our @SLOT_QUEUE; 381our @SLOT_QUEUE;
354our $SLOT_QUEUE; 382our $SLOT_QUEUE;
355 383
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
358 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
359 389
360 while () { 390 while () {
361 next_job: 391 next_job:
362 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
370 } 400 }
371 } 401 }
372 } 402 }
373 403
374 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
375 # 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
376 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 407 $signal->wait;
378 } else { 408 } else {
379 Coro::schedule; 409 Coro::schedule;
380 } 410 }
… …
403 433
404BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
405 435
406=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
407 437
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
410partly 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
411acceptable. 441acceptable.
412 442
413If 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
414the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
… …
419 449
420sub sync_job(&) { 450sub sync_job(&) {
421 my ($job) = @_; 451 my ($job) = @_;
422 452
423 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 454 my $time = EV::time;
425 455
426 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
428 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
429 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 462 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
432 464
433 my $busy = 1; 465 my $busy = 1;
434 my @res; 466 my @res;
435 467
436 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 470 @res = eval { $job->() };
438 warn $@ if $@; 471 warn $@ if $@;
439 undef $busy; 472 undef $busy;
440 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
441 474
442 while ($busy) { 475 while ($busy) {
443 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
444 } 480 }
481 }
445 482
446 $time = Event::time - $time; 483 $time = EV::time - $time;
447 484
448 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450 487
451 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
481=item fork_call { }, $args 518=item fork_call { }, $args
482 519
483Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
487 524
488=cut 525=cut
489 526
490sub fork_call(&@) { 527sub fork_call(&@) {
491 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
… …
652attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
654 691
655In 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>
656C<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
657Crossfire TRT). 694Deliantra).
658 695
659=over 4 696=over 4
660 697
661=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
662 699
… …
944 } 981 }
945 982
946 0 983 0
947} 984}
948 985
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 987
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 989
953Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
954 991
… …
960 997
961=cut 998=cut
962 999
963############################################################################# 1000#############################################################################
964# object support 1001# object support
965#
966 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#
967sub _can_merge { 1036sub _can_merge {
968 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
969 1038
970 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1040
974 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
975} 1043}
976 1044
977sub reattach { 1045sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1047 my ($obj) = @_;
… …
1001cf::attachable->attach ( 1069cf::attachable->attach (
1002 prio => -1000000, 1070 prio => -1000000,
1003 on_instantiate => sub { 1071 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1005 1073
1006 $data = from_json $data; 1074 $data = decode_json $data;
1007 1075
1008 for (@$data) { 1076 for (@$data) {
1009 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1010 1078
1011 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1092 },
1025); 1093);
1026 1094
1027sub object_freezer_save { 1095sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1097
1032 sync_job { 1098 sync_job {
1033 if (length $$rdata) { 1099 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1100 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
… …
1042 close $fh; 1108 close $fh;
1043 1109
1044 if (@$objs) { 1110 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1116 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1118 }
… …
1061 } else { 1127 } else {
1062 aio_unlink $filename; 1128 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1064 } 1130 }
1065 }; 1131 };
1066
1067 undef $guard;
1068} 1132}
1069 1133
1070sub object_freezer_as_string { 1134sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1072 1136
… …
1077 1141
1078sub object_thawer_load { 1142sub object_thawer_load {
1079 my ($filename) = @_; 1143 my ($filename) = @_;
1080 1144
1081 my ($data, $av); 1145 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1146
1085 (aio_load $filename, $data) >= 0 1147 (aio_load $filename, $data) >= 0
1086 or return; 1148 or return;
1087 1149
1088 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1152 or return;
1091 1153
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1094 } 1156 }
1095 1157
1096 utf8::decode (my $decname = $filename); 1158 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1256 1318
1257 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1320 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1322 }
1262 1323
1263 warn $msg; 1324 warn $msg;
1264 } 1325 }
1265 1326
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1414
1354 my $f = new_from_file cf::object::thawer path $login 1415 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1416 or return;
1356 1417
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1418 my $pl = cf::player::load_pl $f
1359 or return; 1419 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1420 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1421 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
… …
1514 1574
1515Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1516 1576
1517=cut 1577=cut
1518 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
1519sub expand_cfpod { 1590sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1521 1592
1522 # escape & and < 1593 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1594
1526 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1527 1598
1528 1 while 1599 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1534 # replace G<male|female> tags 1605 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1536 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1537 }ge 1608 | < $interior >
1538 # replace H<hint text> 1609 )
1539 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1632 "")
1544 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1546 1644
1645 for ($xml) {
1547 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1549 1648
1550 # compress some whitespace 1649 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1555 1655
1556 $_ 1656 $xml
1557} 1657}
1658
1659no re 'eval';
1558 1660
1559sub hintmode { 1661sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1663 $_[0]{hintmode}
1562} 1664}
… …
2043 } 2145 }
2044 2146
2045 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2046 2148
2047 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2048 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2154 if (my $map = find $k) {
2051 $map->load if $v; 2155 $map->load if $v;
2052 } 2156 }
… …
2078 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2079 2183
2080 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2081 2185
2082 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2084 }; 2189 };
2085 2190
2086 if ($uniq) { 2191 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2379=cut
2275 2380
2276sub deref { 2381sub deref {
2277 my ($ref) = @_; 2382 my ($ref) = @_;
2278 2383
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2385 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2387 or return;
2286 $pl->ob->uuid eq $uuid 2388 $pl->ob->uuid eq $uuid
2287 or return; 2389 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2561
2460 $self->enter_link; 2562 $self->enter_link;
2461 2563
2462 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2463 # *tag paths override both path and x|y 2567 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2568 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 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
2467 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2468 } 2583 }
2469 } 2584 }
2470 2585
2471 my $map = eval { 2586 my $map = eval {
2472 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2473 2588
2474 if ($map) { 2589 if ($map) {
2475 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2476 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2477 } else { 2592 } else {
2478 $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);
2479 } 2594 }
2480 2595
2481 $map 2596 $map
2482 }; 2597 };
2483 2598
… …
2536 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2537 } 2652 }
2538 2653
2539 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2540 2655
2541 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2542 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2543 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2544 2659
2545 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2546 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2573 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2574 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2575 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2576 2691
2577 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2578 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2579 unless (eval { 2696 unless (eval {
2580 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2581 2698
2582 1; 2699 1;
… …
2617the 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
2618the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2619 2736
2620=cut 2737=cut
2621 2738
2739# non-persistent channels (usually the info channel)
2622our %CHANNEL = ( 2740our %CHANNEL = (
2623 "c/identify" => { 2741 "c/identify" => {
2624 id => "identify", 2742 id => "infobox",
2625 title => "Identify", 2743 title => "Identify",
2626 reply => undef, 2744 reply => undef,
2627 tooltip => "Items recently identified", 2745 tooltip => "Items recently identified",
2628 }, 2746 },
2629 "c/examine" => { 2747 "c/examine" => {
2630 id => "examine", 2748 id => "infobox",
2631 title => "Examine", 2749 title => "Examine",
2632 reply => undef, 2750 reply => undef,
2633 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2634 }, 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 },
2635); 2789);
2636 2790
2637sub cf::client::send_msg { 2791sub cf::client::send_msg {
2638 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2639 2793
2640 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2641 2795
2642 $color &= cf::NDI_CLIENT_MASK; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2643 2797
2644 # check predefined channels, for the benefit of C 2798 # check predefined channels, for the benefit of C
2645 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2646 2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2647 if (ref $channel) { 2807 } elsif (ref $channel) {
2648 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2649 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2650 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2651 $self->ext_msg (channel_info => $channel) 2811 $self->ext_msg (channel_info => $channel)
2652 if $self->can_msg; 2812 if $self->can_msg;
… …
2869=pod 3029=pod
2870 3030
2871The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2872 3032
2873 cf::object 3033 cf::object
2874 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
2875 insert remove name archname title slaying race decrease_ob_nr 3035 insert remove name archname title slaying race decrease_ob_nr
2876 3036
2877 cf::object::player 3037 cf::object::player
2878 player 3038 player
2879 3039
… …
2886=cut 3046=cut
2887 3047
2888for ( 3048for (
2889 ["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
2890 insert remove inv name archname title slaying race 3050 insert remove inv name archname title slaying race
2891 decrease_ob_nr)], 3051 decrease_ob_nr destroy)],
2892 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2893 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2894 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2895) { 3055) {
2896 no strict 'refs'; 3056 no strict 'refs';
… …
3001 { 3161 {
3002 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
3003 3163
3004 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3005 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
3006 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3007 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
3008 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};
3009 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};
3010 3171
3011 cf::cede_to_tick; 3172 cf::cede_to_tick;
3012 } 3173 }
3013 3174
3014 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
3015 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
3016 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
3017 or next; 3179 or next;
3180
3018 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3019 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
3020 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3021 } else { 3184 } else {
3022 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3040 { 3203 {
3041 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
3042 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
3043 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
3044 3207
3045 my $soundconf = delete $res->{"res/sound.conf"};
3046
3047 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3048 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3049 my $data; 3211 my $data;
3050 3212
3051 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
3052 # prepend meta info 3214 # prepend meta info
3053 3215
3054 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
3055 name => $name, 3217 name => $name,
3056 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
3057 }); 3219 });
3058 3220
3059 $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};
3060 } else { 3228 } else {
3061 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
3062 } 3230 }
3063 3231
3064 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3065 cf::face::set_type $idx, $info->{type};
3066
3067 cf::cede_to_tick; 3232 cf::cede_to_tick;
3068 } 3233 }
3069
3070 if ($soundconf) {
3071 $soundconf = $enc->decode (delete $soundconf->{data});
3072
3073 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3074 my $sound = $soundconf->{compat}[$_]
3075 or next;
3076
3077 my $face = cf::face::find "sound/$sound->[1]";
3078 cf::sound::set $sound->[0] => $face;
3079 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3080 }
3081
3082 while (my ($k, $v) = each %{$soundconf->{event}}) {
3083 my $face = cf::face::find "sound/$v";
3084 cf::sound::set $k => $face;
3085 }
3086 }
3087 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3088 3237
3089 1 3238 1
3090} 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});
3091 3260
3092register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
3093 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
3094 3263
3095 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
… …
3150sub reload_config { 3319sub reload_config {
3151 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3152 or return; 3321 or return;
3153 3322
3154 local $/; 3323 local $/;
3155 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3156 3325
3157 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3158 3327
3159 $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};
3160 $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};
… …
3171sub main { 3340sub main {
3172 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3173 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3174 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#
3175 (async { 3344 (async {
3176 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
3177 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3178 }; 3348 };
3179 3349
3180 reload_config; 3350 reload_config;
3181 db_init; 3351 db_init;
3182 load_extensions; 3352 load_extensions;
3183 3353
3184 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3185 Event::loop; 3356 EV::loop;
3186} 3357}
3187 3358
3188############################################################################# 3359#############################################################################
3189# initialisation and cleanup 3360# initialisation and cleanup
3190 3361
3191# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3192BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3193 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3194 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3195 reentrant => 0,
3196 data => WF_AUTOCANCEL,
3197 signal => $signal,
3198 prio => 0,
3199 cb => sub {
3200 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
3201 },
3202 ); 3368 };
3203 } 3369 }
3204} 3370}
3205 3371
3206sub write_runtime { 3372sub write_runtime {
3207 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3252 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3253 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3254 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3255 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3256 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3257 $pl->save; 3424 $pl->save;
3258 } 3425 }
3259 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3260 3427
3261 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3300 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3301 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3302 3469
3303 # 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
3304 3471
3305 warn "cancelling all WF_AUTOCANCEL watchers";
3306 for (Event::all_watchers) {
3307 $_->cancel if $_->data & WF_AUTOCANCEL;
3308 }
3309
3310 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3311 for (;;) { 3473 for (;;) {
3312 BDB::flush; 3474 BDB::flush;
3313 IO::AIO::flush; 3475 IO::AIO::flush;
3314 Coro::cede; 3476 Coro::cede_notself;
3315 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3316 warn "iterate..."; 3478 warn "iterate...";
3317 } 3479 }
3318 3480
3319 ++$RELOAD; 3481 ++$RELOAD;
… …
3395 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3396 3558
3397 1 3559 1
3398 } or do { 3560 } or do {
3399 warn $@; 3561 warn $@;
3400 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3401 exit 1;
3402 }; 3563 };
3403 3564
3404 warn "reloaded"; 3565 warn "reloaded";
3405}; 3566};
3406 3567
… …
3408 3569
3409sub reload_perl() { 3570sub reload_perl() {
3410 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3411 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3412 3573
3413 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3414 reentrant => 0,
3415 after => 0,
3416 data => WF_AUTOCANCEL,
3417 cb => sub {
3418 do_reload_perl; 3575 do_reload_perl;
3419 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3420 },
3421 ); 3577 };
3422} 3578}
3423 3579
3424register_command "reload" => sub { 3580register_command "reload" => sub {
3425 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3426 3582
3427 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3428 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3429 async { reload_perl }; 3587 reload_perl;
3588 };
3430 } 3589 }
3431}; 3590};
3432 3591
3433unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3434 3593
… …
3453 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3454 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3455 $signal->wait; 3614 $signal->wait;
3456} 3615}
3457 3616
3458our $stat_fh; 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3459sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3460
3461$TICK_WATCHER = Event->timer (
3462 reentrant => 0,
3463 parked => 1,
3464 prio => 0,
3465 at => $NEXT_TICK || $TICK,
3466 data => WF_AUTOCANCEL,
3467 cb => sub {
3468 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3469 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"
3470 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3471 return; 3621 return;
3472 } 3622 }
3473 3623
3474 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3475
3476 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3477 3625
3478 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3479 3627
3480 $RUNTIME += $TICK; 3628 $RUNTIME += $TICK;
3481 $NEXT_TICK += $TICK; 3629 $NEXT_TICK = $_[0]->at;
3482 3630
3483 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3484 $NEXT_RUNTIME_WRITE = $NOW + 10; 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3485 Coro::async_pool { 3633 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver";
3486 write_runtime 3635 write_runtime
3487 or warn "ERROR: unable to write runtime file: $!"; 3636 or warn "ERROR: unable to write runtime file: $!";
3488 };
3489 } 3637 };
3638 }
3490 3639
3491# my $AFTER = Event::time;
3492# warn $AFTER - $NOW;#d#
3493
3494 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3495 $sig->send; 3641 $sig->send;
3496 } 3642 }
3497 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3498 $sig->send; 3644 $sig->send;
3499 } 3645 }
3500 3646
3501 $NOW = Event::time;
3502
3503 # if we are delayed by four ticks or more, skip them all
3504 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3505
3506 $TICK_WATCHER->at ($NEXT_TICK);
3507 $TICK_WATCHER->start;
3508
3509 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3510 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3511 3649
3512 _post_tick; 3650 _post_tick;
3513 3651};
3514 # gather some statistics#d# 3652$TICK_WATCHER->priority (EV::MAXPRI);
3515 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3516 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3517 },
3518);
3519 3653
3520{ 3654{
3655 # configure BDB
3656
3521 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3658 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3659 $Coro::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3660
3547 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3548 $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);
3549 3667
3550 cf::sync_job { 3668 cf::sync_job {
3551 eval { 3669 eval {
3552 BDB::db_env_open 3670 BDB::db_env_open
3553 $DB_ENV, 3671 $DB_ENV,
… …
3555 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
3556 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3557 0666; 3675 0666;
3558 3676
3559 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3560
3561 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3562 | BDB::LOG_AUTOREMOVE, 1);
3563 $DB_ENV->set_lk_detect;
3564 }; 3678 };
3565 3679
3566 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3681 };
3568 } 3682 }
3569 3683
3570 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 11, 3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3572 interval => 60, 3686 };
3573 hard => 1, 3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3578 },
3579 ); 3689 };
3580 $BDB_TRICKLE_WATCHER = Event->timer ( 3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3581 after => 5,
3582 interval => 10,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3588 },
3589 ); 3692 };
3590} 3693}
3591 3694
3592{ 3695{
3696 # configure IO::AIO
3697
3593 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3594
3595 undef $Coro::AIO::WATCHER;
3596 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3597 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3598 reentrant => 0,
3599 data => WF_AUTOCANCEL,
3600 fd => IO::AIO::poll_fileno,
3601 poll => 'r',
3602 prio => 6,
3603 cb => \&IO::AIO::poll_cb,
3604 );
3605} 3701}
3606 3702
3607my $_log_backtrace; 3703my $_log_backtrace;
3608 3704
3609sub _log_backtrace { 3705sub _log_backtrace {
… …
3613 3709
3614 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3615 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3616 ++$_log_backtrace; 3712 ++$_log_backtrace;
3617 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3618 my @bt = fork_call { 3716 my @bt = fork_call {
3619 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3620 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3621 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 |"
3622 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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