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.289 by root, Sat Jun 30 03:00:54 2007 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 74
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 76
50our %COMMAND = (); 77our %COMMAND = ();
51our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
54our %EXTCMD = (); 81our %EXTCMD = ();
55our %EXTICMD = (); 82our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
58 85
59our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 87our @EVENT;
61 88
62our $CONFDIR = confdir; 89our $CONFDIR = confdir;
63our $DATADIR = datadir; 90our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
73 104
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 107our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
81 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 113our $DB_ENV;
84 114
85our %CFG; 115our %CFG;
86 116
87our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 118our $RUNTIME;
119our $NOW;
89 120
90our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
93 124
94# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 127
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
100 134
101binmode STDOUT; 135binmode STDOUT;
102binmode STDERR; 136binmode STDERR;
103 137
104# read virtual server time, if available 138# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
109} 143}
110 144
111mkdir $_ 145mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
157 191
158The raw value load value from the last tick. 192The raw value load value from the last tick.
159 193
160=item %cf::CFG 194=item %cf::CFG
161 195
162Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 197from wherever your confdir points to.
164 198
165=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
166 200
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 202returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 203per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 204
205=item @cf::INVOKE_RESULTS
206
207This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call.
210
171=back 211=back
172 212
173=cut 213=cut
174 214
175BEGIN { 215BEGIN {
… …
179 $msg .= "\n" 219 $msg .= "\n"
180 unless $msg =~ /\n$/; 220 unless $msg =~ /\n$/;
181 221
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 223
184 utf8::encode $msg;
185 LOG llevError, $msg; 224 LOG llevError, $msg;
186 }; 225 };
187} 226}
227
228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
188 242
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
199for my $pkg (qw( 253for my $pkg (qw(
200 cf::global cf::attachable 254 cf::global cf::attachable
201 cf::object cf::object::player 255 cf::object cf::object::player
202 cf::client cf::player 256 cf::client cf::player
203 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
204 cf::map cf::party cf::region 259 cf::party cf::region
205)) { 260)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 262}
209 263
210$Event::DIED = sub { 264$EV::DIED = sub {
211 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
212}; 266};
213 267
214############################################################################# 268#############################################################################
215 269
… …
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 293 $d
240 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
241} 295}
242 296
243=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
244 298
245Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
246 300
247=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
248 302
249Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
250 304
251=cut 305=cut
252 306
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 308
255sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
257 325
258=item cf::lock_wait $string 326=item cf::lock_wait $string
259 327
260Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
261 329
… …
264Wait until the given lock is available and then acquires it and returns 332Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 333a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 334for example when the coroutine gets canceled), the lock is automatically
267returned. 335returned.
268 336
337Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro.
339
269Lock names should begin with a unique identifier (for example, cf::map::find 340Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 341uses map_find and cf::map::load uses map_load).
271 342
272=item $locked = cf::lock_active $string 343=item $locked = cf::lock_active $string
273 344
274Return true if the lock is currently active, i.e. somebody has locked it. 345Return true if the lock is currently active, i.e. somebody has locked it.
275 346
276=cut 347=cut
277 348
278our %LOCK; 349our %LOCK;
350our %LOCKER;#d#
279 351
280sub lock_wait($) { 352sub lock_wait($) {
281 my ($key) = @_; 353 my ($key) = @_;
282 354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
283 # wait for lock, if any 360 # wait for lock, if any
284 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
285 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 364 Coro::schedule;
287 } 365 }
288} 366}
289 367
… …
292 370
293 # wait, to be sure we are not locked 371 # wait, to be sure we are not locked
294 lock_wait $key; 372 lock_wait $key;
295 373
296 $LOCK{$key} = []; 374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
297 376
298 Coro::guard { 377 Coro::guard {
378 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 379 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 380 $_->ready for @{ delete $LOCK{$key} };
301 } 381 }
302} 382}
303 383
… …
306 386
307 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
308} 388}
309 389
310sub freeze_mainloop { 390sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
312 392
313 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 394}
395
396=item cf::periodic $interval, $cb
397
398Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer.
400
401=cut
402
403sub periodic($$) {
404 my ($interval, $cb) = @_;
405
406 my $start = rand List::Util::min 180, $interval;
407
408 EV::periodic $start, $interval, 0, $cb
409}
410
411=item cf::get_slot $time[, $priority[, $name]]
412
413Allocate $time seconds of blocking CPU time at priority C<$priority>:
414This call blocks and returns only when you have at least C<$time> seconds
415of cpu time till the next tick. The slot is only valid till the next cede.
416
417The optional C<$name> can be used to identify the job to run. It might be
418used for statistical purposes and should identify the same time-class.
419
420Useful for short background jobs.
421
422=cut
423
424our @SLOT_QUEUE;
425our $SLOT_QUEUE;
426
427$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager");
430
431 my $signal = new Coro::Signal;
432
433 while () {
434 next_job:
435 my $avail = cf::till_tick;
436 if ($avail > 0.01) {
437 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) {
439 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send;
441 Coro::cede;
442 goto next_job;
443 }
444 }
445 }
446
447 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait;
451 } else {
452 Coro::schedule;
453 }
315 }; 454 }
316 $TICK_WATCHER->stop; 455};
317 $guard 456
457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
460 my ($time, $pri, $name) = @_;
461
462 $time = $TICK * .6 if $time > $TICK * .6;
463 my $sig = new Coro::Signal;
464
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready;
468 $sig->wait;
318} 469}
319 470
320=item cf::async { BLOCK } 471=item cf::async { BLOCK }
321 472
322Currently the same as Coro::async_pool, meaning you cannot use 473Currently the same as Coro::async_pool, meaning you cannot use
… …
327 478
328BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
329 480
330=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
331 482
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 486acceptable.
336 487
337If it must be done, put the blocking parts into C<sync_job>. This will run 488If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
… …
343 494
344sub sync_job(&) { 495sub sync_job(&) {
345 my ($job) = @_; 496 my ($job) = @_;
346 497
347 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 499 my $time = EV::time;
349 500
350 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
352 503
353 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 505
355 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
356 507
357 my $busy = 1; 508 my $busy = 1;
358 my @res; 509 my @res;
359 510
360 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 513 @res = eval { $job->() };
362 warn $@ if $@; 514 warn $@ if $@;
363 undef $busy; 515 undef $busy;
364 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
365 517
366 while ($busy) { 518 while ($busy) {
367 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
368 } 523 }
524 }
369 525
370 $time = Event::time - $time; 526 my $time = EV::time - $time;
371 527
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
376 529
377 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
378 } else { 531 } else {
379 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
380 533
… …
405=item fork_call { }, $args 558=item fork_call { }, $args
406 559
407Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
411 564
412=cut 565=cut
413 566
414sub fork_call(&@) { 567sub fork_call(&@) {
415 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
416 569
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 570 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 571 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 572 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 573
422 if (my $pid = fork) { 574 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 575 reset_signals;
435 local $SIG{__WARN__}; 576 &$cb
436 local $SIG{__DIE__}; 577 }, @args;
437 eval {
438 close $fh1;
439 578
440 my @res = eval { $cb->(@args) }; 579 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 580}
442 };
443 581
444 warn $@ if $@; 582=item $coin = coin_from_name $name
445 _exit 0; 583
446 } 584=cut
585
586our %coin_alias = (
587 "silver" => "silvercoin",
588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
447} 607}
448 608
449=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
450 610
451Returns a single value from the environment database. 611Returns a single value from the environment database.
… …
453=item cf::db_put $family => $key => $value 613=item cf::db_put $family => $key => $value
454 614
455Stores the given C<$value> in the family. It can currently store binary 615Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 616data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 617
618=item $db = cf::db_table "name"
619
620Create and/or open a new database table. The string must not be "db" and must be unique
621within each server.
622
458=cut 623=cut
624
625sub db_table($) {
626 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV;
628
629 eval {
630 $db->set_flags (BDB::CHKSUM);
631
632 utf8::encode $name;
633 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
634 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
635 cf::cleanup "db_open(db): $!" if $!;
636 };
637 cf::cleanup "db_open(db): $@" if $@;
638
639 $db
640}
459 641
460our $DB; 642our $DB;
461 643
462sub db_init { 644sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 645 cf::sync_job {
467 eval { 646 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 647 };
477} 648}
478 649
479sub db_get($$) { 650sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 651 my $key = "$_[0]/$_[1]";
481 652
… …
531 if (1) { 702 if (1) {
532 $md5 = 703 $md5 =
533 join "\x00", 704 join "\x00",
534 $processversion, 705 $processversion,
535 map { 706 map {
536 Coro::cede; 707 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 708 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 709 } 0.. $#$src;
539 710
540 711
541 my $dbmd5 = db_get cache => "$id/md5"; 712 my $dbmd5 = db_get cache => "$id/md5";
… …
579 750
580############################################################################# 751#############################################################################
581 752
582=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
583 754
584Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
585attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
587 758
588In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 761Deliantra).
591 762
592=over 4 763=over 4
593 764
594=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
595 766
… …
639=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
640 811
641Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
643 814
644Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
645that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
646 817
647These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
648 819
649=over 4 820=over 4
… …
847 "; 1018 ";
848 die if $@; 1019 die if $@;
849} 1020}
850 1021
851our $override; 1022our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1023our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 1024
854sub override { 1025sub override {
855 $override = 1; 1026 $override = 1;
856 @invoke_results = (); 1027 @INVOKE_RESULTS = (@_);
857} 1028}
858 1029
859sub do_invoke { 1030sub do_invoke {
860 my $event = shift; 1031 my $event = shift;
861 my $callbacks = shift; 1032 my $callbacks = shift;
862 1033
863 @invoke_results = (); 1034 @INVOKE_RESULTS = ();
864 1035
865 local $override; 1036 local $override;
866 1037
867 for (@$callbacks) { 1038 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1039 eval { &{$_->[1]} };
… …
877 } 1048 }
878 1049
879 0 1050 0
880} 1051}
881 1052
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1054
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1056
886Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
887 1058
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1059This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1060removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1061results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1062
892=back 1063=back
893 1064
894=cut 1065=cut
895 1066
896############################################################################# 1067#############################################################################
897# object support 1068# object support
1069
1070sub _object_equal($$);
1071sub _object_equal($$) {
1072 my ($a, $b) = @_;
1073
1074 return 0 unless (ref $a) eq (ref $b);
1075
1076 if ("HASH" eq ref $a) {
1077 my @ka = keys %$a;
1078 my @kb = keys %$b;
1079
1080 return 0 if @ka != @kb;
1081
1082 for (0 .. $#ka) {
1083 return 0 unless $ka[$_] eq $kb[$_];
1084 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1085 }
1086
1087 } elsif ("ARRAY" eq ref $a) {
1088
1089 return 0 if @$a != @$b;
1090
1091 for (0 .. $#$a) {
1092 return 0 unless _object_equal $a->[$_], $b->[$_];
1093 }
1094
1095 } elsif ($a ne $b) {
1096 return 0;
1097 }
1098
1099 1
1100}
1101
1102our $SLOW_MERGES;#d#
1103sub _can_merge {
1104 my ($ob1, $ob2) = @_;
1105
1106 ++$SLOW_MERGES;#d#
1107
1108 # we do the slow way here
1109 return _object_equal $ob1, $ob2
1110}
898 1111
899sub reattach { 1112sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1114 my ($obj) = @_;
902 1115
1116 # no longer needed after getting rid of delete_package?
903 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
904 1118
905 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
906 1120
907 @$registry = (); 1121 @$registry = ();
908 1122
… …
923cf::attachable->attach ( 1137cf::attachable->attach (
924 prio => -1000000, 1138 prio => -1000000,
925 on_instantiate => sub { 1139 on_instantiate => sub {
926 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
927 1141
928 $data = from_json $data; 1142 $data = decode_json $data;
929 1143
930 for (@$data) { 1144 for (@$data) {
931 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
932 1146
933 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
… …
949sub object_freezer_save { 1163sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
951 1165
952 sync_job { 1166 sync_job {
953 if (length $$rdata) { 1167 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
956 1171
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1176 aio_close $fh;
962 1177
963 if (@$objs) { 1178 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1184 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
971 } 1186 }
972 } else { 1187 } else {
973 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
974 } 1189 }
… …
979 } 1194 }
980 } else { 1195 } else {
981 aio_unlink $filename; 1196 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
983 } 1198 }
984 } 1199 };
985} 1200}
986 1201
987sub object_freezer_as_string { 1202sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1203 my ($rdata, $objs) = @_;
989 1204
… …
1001 or return; 1216 or return;
1002 1217
1003 unless (aio_stat "$filename.pst") { 1218 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1219 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1220 or return;
1221
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1222 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs};
1007 } 1224 }
1008 1225
1226 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1227 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1228 $decname, length $data, scalar @{$av || []};
1229
1011 return ($data, $av); 1230 ($data, $av)
1012} 1231}
1013 1232
1014=head2 COMMAND CALLBACKS 1233=head2 COMMAND CALLBACKS
1015 1234
1016=over 4 1235=over 4
… …
1086 cf::override; 1305 cf::override;
1087 }, 1306 },
1088 on_extcmd => sub { 1307 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1308 my ($pl, $buf) = @_;
1090 1309
1091 my $msg = eval { from_json $buf }; 1310 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1311
1093 if (ref $msg) { 1312 if (ref $msg) {
1313 my ($type, $reply, @payload) =
1314 "ARRAY" eq ref $msg
1315 ? @$msg
1316 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1317
1318 my @reply;
1319
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1320 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1321 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1322 }
1323
1324 $pl->ext_reply ($reply, @reply)
1325 if $reply;
1326
1099 } else { 1327 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1329 }
1102 1330
1103 cf::override; 1331 cf::override;
… …
1130 1358
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1361
1134 $ext{source} = 1362 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1137 . $source 1365 . $source
1138 . "\n};\n1"; 1366 . "\n};\n1";
1139 1367
1140 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
… …
1156 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1158 1386
1159 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1388 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1390 }
1164 1391
1165 warn $msg; 1392 warn $msg;
1166 } 1393 }
1167 1394
… …
1181 1408
1182=back 1409=back
1183 1410
1184=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1185 1412
1186Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1187 1414
1188=cut 1415=cut
1189 1416
1190package cf::player; 1417package cf::player;
1191 1418
1192use Coro::AIO; 1419use Coro::AIO;
1193 1420
1194=head3 cf::player 1421=head3 cf::player
1195 1422
1196=over 4 1423=over 4
1424
1425=item cf::player::num_playing
1426
1427Returns the official number of playing players, as per the Crossfire metaserver rules.
1428
1429=cut
1430
1431sub num_playing {
1432 scalar grep
1433 $_->ob->map
1434 && !$_->hidden
1435 && !$_->ob->flag (cf::FLAG_WIZ),
1436 cf::player::list
1437}
1197 1438
1198=item cf::player::find $login 1439=item cf::player::find $login
1199 1440
1200Returns the given player object, loading it if necessary (might block). 1441Returns the given player object, loading it if necessary (might block).
1201 1442
… …
1220 1461
1221sub exists($) { 1462sub exists($) {
1222 my ($login) = @_; 1463 my ($login) = @_;
1223 1464
1224 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1226} 1467}
1227 1468
1228sub find($) { 1469sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1471 my $login = $_[0];
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1478 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1479 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1480 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1481 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1482
1242 my $pl = load_pl path $login 1483 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1484 or return;
1485
1486 my $pl = cf::player::load_pl $f
1487 or return;
1488
1489 local $cf::PLAYER_LOADING{$login} = $pl;
1490 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1245 } 1492 }
1246 } 1493 }
1247} 1494}
1248 1495
… …
1257 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1258 1505
1259 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1261 1508
1509 cf::get_slot 0.01;
1510
1262 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1263 Coro::cede; 1512 cf::cede_to_tick;
1264} 1513}
1265 1514
1266sub new($) { 1515sub new($) {
1267 my ($login) = @_; 1516 my ($login) = @_;
1268 1517
… …
1274 $cf::PLAYER{$login} = $self; 1523 $cf::PLAYER{$login} = $self;
1275 1524
1276 $self 1525 $self
1277} 1526}
1278 1527
1528=item $player->send_msg ($channel, $msg, $color, [extra...])
1529
1530=cut
1531
1532sub send_msg {
1533 my $ns = shift->ns
1534 or return;
1535 $ns->send_msg (@_);
1536}
1537
1279=item $pl->quit_character 1538=item $pl->quit_character
1280 1539
1281Nukes the player without looking back. If logged in, the connection will 1540Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1541be destroyed. May block for a long time.
1283 1542
… …
1287 my ($pl) = @_; 1546 my ($pl) = @_;
1288 1547
1289 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1290 1549
1291 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1292 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1293 1552
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1298 1559
1299 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1336 or return []; 1597 or return [];
1337 1598
1338 my @logins; 1599 my @logins;
1339 1600
1340 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1602 my $path = path $login;
1603
1604 # a .pst is a dead give-away for a valid player
1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1610 }
1344 1611
1345 utf8::decode $login; 1612 utf8::decode $login;
1346 push @logins, $login; 1613 push @logins, $login;
1347 } 1614 }
1348 1615
… …
1375 } 1642 }
1376 1643
1377 \@paths 1644 \@paths
1378} 1645}
1379 1646
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1648
1382Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1383 1650
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1413=item $player->ext_reply ($msgid, %msg) 1651=item $player->ext_reply ($msgid, @msg)
1414 1652
1415Sends an ext reply to the player. 1653Sends an ext reply to the player.
1416 1654
1417=cut 1655=cut
1418 1656
1419sub ext_reply($$%) { 1657sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1658 my ($self, $id, @msg) = @_;
1421 1659
1422 $msg{msgid} = $id; 1660 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . cf::to_json \%msg);
1424} 1661}
1425 1662
1426=item $player->ext_event ($type, %msg) 1663=item $player->ext_msg ($type, @msg)
1427 1664
1428Sends an ext event to the client. 1665Sends an ext event to the client.
1429 1666
1430=cut 1667=cut
1431 1668
1432sub ext_event($$%) { 1669sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1670 my ($self, $type, @msg) = @_;
1434 1671
1435 $self->ns->ext_event ($type, %msg); 1672 $self->ns->ext_msg ($type, @msg);
1436} 1673}
1437 1674
1438=head3 cf::region 1675=head3 cf::region
1439 1676
1440=over 4 1677=over 4
… …
1453 my ($path) = @_; 1690 my ($path) = @_;
1454 1691
1455 my ($match, $specificity); 1692 my ($match, $specificity);
1456 1693
1457 for my $region (list) { 1694 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1695 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1696 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1697 if $region->specificity > $specificity;
1461 } 1698 }
1462 } 1699 }
1463 1700
… …
1484our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1485our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1486 1723
1487sub generate_random_map { 1724sub generate_random_map {
1488 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1489 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1490 $self->_create_random_map ( 1730 $self->_create_random_map (
1491 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1492 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1493 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1583 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1584 return $self; 1824 return $self;
1585 } 1825 }
1586 } 1826 }
1587 1827
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1829 ()
1590} 1830}
1591 1831
1592sub init { 1832sub init {
1593 my ($self) = @_; 1833 my ($self) = @_;
… …
1615 1855
1616# the temporary/swap location 1856# the temporary/swap location
1617sub save_path { 1857sub save_path {
1618 my ($self) = @_; 1858 my ($self) = @_;
1619 1859
1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1621 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1622} 1862}
1623 1863
1624# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1625sub uniq_path { 1865sub uniq_path {
1626 my ($self) = @_; 1866 my ($self) = @_;
1627 1867
1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1629 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1630} 1870}
1631 1871
1632# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1633# all maps in C++... 1873# all maps in C++...
… …
1656 1896
1657sub load_header_from($) { 1897sub load_header_from($) {
1658 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1659 1899
1660 utf8::encode $path; 1900 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1666 1909
1667 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1668 1911
1669 1 1912 1
1670} 1913}
… …
1724sub find { 1967sub find {
1725 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1726 1969
1727 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1728 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1730 1974
1731 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1732 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1733 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1734 or return; 1980 or return;
1735 1981
1736 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1737 1983
… …
1739 or return; 1985 or return;
1740 1986
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1991 undef $guard1;
1744 $map->reset; 1992 $map->reset;
1745 undef $guard;
1746 return find $path; 1993 return find $path;
1747 } 1994 }
1748 1995
1749 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1750 } 1997 }
… …
1759 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1760 2007
1761 my $path = $self->{path}; 2008 my $path = $self->{path};
1762 2009
1763 { 2010 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1765 2012
2013 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 2015
1768 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1769 2017
1770 $self->alloc; 2018 $self->alloc;
1771 2019
1772 $self->pre_load; 2020 $self->pre_load;
1773 Coro::cede; 2021 cf::cede_to_tick;
1774 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1776 or return; 2026 or return;
1777 2027
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1779 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1780 2030
1781 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2032 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2035 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1786 } 2039 }
1787 } 2040 }
1788 2041
1789 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1790 # now do the right thing for maps 2045 # now do the right thing for maps
1791 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2048 unless $self->difficulty;
1794 Coro::cede; 2049 cf::cede_to_tick;
1795 2050
1796 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2052 $self->decay_objects;
1798 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1799 $self->update_buttons; 2054 $self->update_buttons;
1800 Coro::cede; 2055 cf::cede_to_tick;
1801 $self->set_darkness_map; 2056 $self->set_darkness_map;
1802 Coro::cede; 2057 cf::cede_to_tick;
1803 $self->activate; 2058 $self->activate;
1804 } 2059 }
1805 2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
2063
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
1807 } 2065 }
1808 2066
1809 $self->post_load; 2067 $self->post_load;
1810} 2068}
1811 2069
… …
1820 2078
1821 $self 2079 $self
1822} 2080}
1823 2081
1824# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1825sub load_diag { 2083sub load_neighbours {
1826 my ($map) = @_; 2084 my ($map) = @_;
1827 2085
1828 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1829 2087
1830 for (0 .. 3) { 2088 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1832 or next; 2090 or next;
1833 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1834 or next; 2092 or next;
1835 $neigh->load; 2093 $neigh->load;
1836 2094
2095 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2098 }
1840 2099
1841 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1843 or next; 2103 or next;
1844 $neigh->load; 2104 $neigh->load;
1845 } 2105 }
1846} 2106}
1847 2107
… …
1852} 2112}
1853 2113
1854sub do_load_sync { 2114sub do_load_sync {
1855 my ($map) = @_; 2115 my ($map) = @_;
1856 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1857 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1858} 2121}
1859 2122
1860our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1862 2125
1863sub find_async { 2126sub find_async {
1864 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1865 2128
1866 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1867 2130
1868 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1870 } 2133 }
1871 2134
1872 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1873 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1874 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2142 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2143 $map->load if $v;
2144 }
1879 2145
1880 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1881 } 2147 }
1882 } 2148 }
1883 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1884 }; 2150 };
1885 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
… …
1888} 2154}
1889 2155
1890sub save { 2156sub save {
1891 my ($self) = @_; 2157 my ($self) = @_;
1892 2158
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 2160
1895 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1896 2162
1897 return unless $self->dirty; 2163 return unless $self->dirty;
1898 2164
… …
1904 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1905 2171
1906 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1907 2173
1908 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1910 }; 2177 };
2178
2179 cf::get_slot 0.02;
1911 2180
1912 if ($uniq) { 2181 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1914 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1915 } else { 2184 } else {
… …
1921 my ($self) = @_; 2190 my ($self) = @_;
1922 2191
1923 # save first because save cedes 2192 # save first because save cedes
1924 $self->save; 2193 $self->save;
1925 2194
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2196
1928 return if $self->players; 2197 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
1930 return if $self->{deny_save}; 2199 return if $self->{deny_save};
1931 2200
2201 $self->in_memory (cf::MAP_SWAPPED);
2202
2203 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP;
1932 $self->clear; 2205 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2206}
1935 2207
1936sub reset_at { 2208sub reset_at {
1937 my ($self) = @_; 2209 my ($self) = @_;
1938 2210
… …
1970 if $uniq; 2242 if $uniq;
1971 } 2243 }
1972 2244
1973 delete $cf::MAP{$self->path}; 2245 delete $cf::MAP{$self->path};
1974 2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2249 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2250
1979 $self->unlink_save; 2251 $self->unlink_save;
1980 $self->destroy; 2252 $self->destroy;
1981} 2253}
1982 2254
1983my $nuke_counter = "aaaa"; 2255my $nuke_counter = "aaaa";
1984 2256
1985sub nuke { 2257sub nuke {
1986 my ($self) = @_; 2258 my ($self) = @_;
1987 2259
2260 {
2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2262
1988 delete $cf::MAP{$self->path}; 2263 delete $cf::MAP{$self->path};
1989 2264
1990 $self->unlink_save; 2265 $self->unlink_save;
1991 2266
1992 bless $self, "cf::map"; 2267 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2268 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2269 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2270 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2272
1998 $cf::MAP{$self->path} = $self; 2273 $cf::MAP{$self->path} = $self;
2274 }
1999 2275
2000 $self->reset; # polite request, might not happen 2276 $self->reset; # polite request, might not happen
2001} 2277}
2002 2278
2003=item $maps = cf::map::tmp_maps 2279=item $maps = cf::map::tmp_maps
… …
2045 2321
2046sub unique_maps() { 2322sub unique_maps() {
2047 [ 2323 [
2048 map { 2324 map {
2049 utf8::decode $_; 2325 utf8::decode $_;
2050 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2051 ? normalise $_ 2329 : normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2054 ] 2331 ]
2055} 2332}
2056 2333
2057package cf;
2058
2059=back 2334=back
2060 2335
2061=head3 cf::object 2336=head3 cf::object
2062 2337
2063=cut 2338=cut
… …
2066 2341
2067=over 4 2342=over 4
2068 2343
2069=item $ob->inv_recursive 2344=item $ob->inv_recursive
2070 2345
2071Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
2072 2348
2073=cut 2349=cut
2074 2350
2075sub inv_recursive_; 2351sub inv_recursive_;
2076sub inv_recursive_ { 2352sub inv_recursive_ {
… …
2079 2355
2080sub inv_recursive { 2356sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2082} 2358}
2083 2359
2360=item $ref = $ob->ref
2361
2362Creates and returns a persistent reference to an object that can be stored as a string.
2363
2364=item $ob = cf::object::deref ($refstring)
2365
2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2367even if the object actually exists. May block.
2368
2369=cut
2370
2371sub deref {
2372 my ($ref) = @_;
2373
2374 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2375 my ($uuid, $name) = ($1, $2);
2376 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2377 or return;
2378 $pl->ob->uuid eq $uuid
2379 or return;
2380
2381 $pl->ob
2382 } else {
2383 warn "$ref: cannot resolve object reference\n";
2384 undef
2385 }
2386}
2387
2084package cf; 2388package cf;
2085 2389
2086=back 2390=back
2087 2391
2088=head3 cf::object::player 2392=head3 cf::object::player
… …
2094Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2398Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2095can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2096dialogue with the given NPC character. 2400dialogue with the given NPC character.
2097 2401
2098=cut 2402=cut
2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2099 2417
2100# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2101# with dialog boxes. 2419# with dialog boxes.
2102#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2103sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
… …
2110 2428
2111 } else { 2429 } else {
2112 my $pl = $self->contr; 2430 my $pl = $self->contr;
2113 2431
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2432 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2435
2123 } else { 2436 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2126 } 2439 }
2127 } 2440 }
2441}
2442
2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2444
2445=cut
2446
2447sub cf::object::send_msg {
2448 my $pl = shift->contr
2449 or return;
2450 $pl->send_msg (@_);
2128} 2451}
2129 2452
2130=item $player_object->may ("access") 2453=item $player_object->may ("access")
2131 2454
2132Returns wether the given player is authorized to access resource "access" 2455Returns wether the given player is authorized to access resource "access"
… …
2145 2468
2146=item $player_object->enter_link 2469=item $player_object->enter_link
2147 2470
2148Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2149 2472
2150The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2151I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2152 2477
2153Will never block. 2478Will never block.
2154 2479
2155=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2156 2481
… …
2211 # use -1 or undef as default coordinates, not 0, 0 2536 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2537 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2538 if $x <=0 && $y <= 0;
2214 2539
2215 $map->load; 2540 $map->load;
2216 $map->load_diag; 2541 $map->load_neighbours;
2217 2542
2218 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2219 $self->activate_recursive; 2545 $self->activate_recursive;
2220 2546
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2223} 2549}
2224 2550
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2552
2227Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2556the new (success) or old (failed) map position. In either case, $done will
2557be called at the end of this process.
2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2231 2561
2232=cut 2562=cut
2233 2563
2234our $GOTOGEN; 2564our $GOTOGEN;
2235 2565
2236sub cf::object::player::goto { 2566sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2567 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2568
2239 # do generation counting so two concurrent goto's will be executed in-order 2569 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2571
2242 $self->enter_link; 2572 $self->enter_link;
2243 2573
2244 (async { 2574 (async {
2575 $Coro::current->{desc} = "player::goto $path $x $y";
2576
2577 # *tag paths override both path and x|y
2578 if ($path =~ /^\*(.*)$/) {
2579 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2580 my $ob = $obs[rand @obs];
2581
2582 # see if we actually can go there
2583 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2584 $ob = $obs[rand @obs];
2585 } else {
2586 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 }
2588 # else put us there anyways for now #d#
2589
2590 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2591 } else {
2592 ($path, $x, $y) = (undef, undef, undef);
2593 }
2594 }
2595
2245 my $map = eval { 2596 my $map = eval {
2246 my $map = cf::map::find $path; 2597 my $map = defined $path ? cf::map::find $path : undef;
2247 2598
2248 if ($map) { 2599 if ($map) {
2249 $map = $map->customise_for ($self); 2600 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2601 $map = $check->($map) if $check && $map;
2251 } else { 2602 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2253 } 2604 }
2254 2605
2255 $map 2606 $map
2256 }; 2607 };
2257 2608
… …
2262 2613
2263 if ($gen == $self->{_goto_generation}) { 2614 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2615 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2616 $self->leave_link ($map, $x, $y);
2266 } 2617 }
2618
2619 $done->() if $done;
2267 })->prio (1); 2620 })->prio (1);
2268} 2621}
2269 2622
2270=item $player_object->enter_exit ($exit_object) 2623=item $player_object->enter_exit ($exit_object)
2271 2624
… …
2291} 2644}
2292 2645
2293sub prepare_random_map { 2646sub prepare_random_map {
2294 my ($exit) = @_; 2647 my ($exit) = @_;
2295 2648
2296 my $guard = cf::lock_acquire "exit_prepare:$exit";
2297
2298 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2299 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2300 # that depends on the exit object 2651 # that depends on the exit object
2301 2652
2302 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
… …
2304 if ($exit->map) { 2655 if ($exit->map) {
2305 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2306 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2307 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2308 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2309 } 2662 }
2310 2663
2311 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2312 2665
2313 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2314 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2316 2669
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2319 undef $fh; 2672 undef $fh;
2320 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2321 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2322 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2323 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2324 } 2681 }
2325} 2682}
2326 2683
2327sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2328 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2329 2686
2330 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2331 2688
2332 if ($exit->slaying eq "/!") {
2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
2336 cf::sync_job { prepare_random_map $exit };
2337 }
2338
2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2340 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp;
2342
2343 $self->enter_link; 2689 $self->enter_link;
2344 2690
2345 (async { 2691 (async {
2346 $self->deactivate_recursive; # just to be sure 2692 $Coro::current->{desc} = "enter_exit";
2693
2347 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2348 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2349 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2350 1; 2715 1
2351 }) { 2716 }) {
2352 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2353 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2354 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2355 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2356 2721
2357 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2376 2741
2377 utf8::encode $text; 2742 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2744}
2380 2745
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2746=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2747
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2748Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2749client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2750the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2751the message unless the client supports the msg packet.
2387 2752
2388=cut 2753=cut
2389 2754
2755# non-persistent channels (usually the info channel)
2756our %CHANNEL = (
2757 "c/identify" => {
2758 id => "infobox",
2759 title => "Identify",
2760 reply => undef,
2761 tooltip => "Items recently identified",
2762 },
2763 "c/examine" => {
2764 id => "infobox",
2765 title => "Examine",
2766 reply => undef,
2767 tooltip => "Signs and other items you examined",
2768 },
2769 "c/book" => {
2770 id => "infobox",
2771 title => "Book",
2772 reply => undef,
2773 tooltip => "The contents of a note or book",
2774 },
2775 "c/lookat" => {
2776 id => "infobox",
2777 title => "Look",
2778 reply => undef,
2779 tooltip => "What you saw there",
2780 },
2781 "c/who" => {
2782 id => "infobox",
2783 title => "Players",
2784 reply => undef,
2785 tooltip => "Shows players who are currently online",
2786 },
2787 "c/body" => {
2788 id => "infobox",
2789 title => "Body Parts",
2790 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available",
2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2799 "c/uptime" => {
2800 id => "infobox",
2801 title => "Uptime",
2802 reply => undef,
2803 tooltip => "How long the server has been running since last restart",
2804 },
2805 "c/mapinfo" => {
2806 id => "infobox",
2807 title => "Map Info",
2808 reply => undef,
2809 tooltip => "Information related to the maps",
2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2817);
2818
2390sub cf::client::send_msg { 2819sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2821
2393 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2824
2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2826
2827 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel};
2830
2831 $self->ext_msg (channel_info => $channel)
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id};
2835
2836 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel)
2841 if $self->can_msg;
2842 }
2843
2844 $channel = $channel->{id};
2845 }
2846
2847 return unless @extra || length $msg;
2394 2848
2395 if ($self->can_msg) { 2849 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2850 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF;
2853
2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2397 } else { 2870 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) { 2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2409 if (0 && $msg =~ /\[/) { 2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2889 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2891 $self->send_packet ("drawinfo $color $msg")
2414 } 2892 }
2415 } 2893 }
2416 } 2894 }
2417} 2895}
2418 2896
2419=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2420 2898
2421Sends an ext event to the client. 2899Sends an ext event to the client.
2422 2900
2423=cut 2901=cut
2424 2902
2425sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2427 2905
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg); 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2430} 2930}
2431 2931
2432=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2433 2933
2434Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
… …
2457 2957
2458 1 2958 1
2459} 2959}
2460 2960
2461cf::client->attach ( 2961cf::client->attach (
2962 on_connect => sub {
2963 my ($ns) = @_;
2964
2965 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2966 },
2462 on_reply => sub { 2967 on_reply => sub {
2463 my ($ns, $msg) = @_; 2968 my ($ns, $msg) = @_;
2464 2969
2465 # this weird shuffling is so that direct followup queries 2970 # this weird shuffling is so that direct followup queries
2466 # get handled first 2971 # get handled first
… …
2481 } 2986 }
2482 }, 2987 },
2483 on_exticmd => sub { 2988 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2989 my ($ns, $buf) = @_;
2485 2990
2486 my $msg = eval { from_json $buf }; 2991 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2992
2488 if (ref $msg) { 2993 if (ref $msg) {
2994 my ($type, $reply, @payload) =
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998
2999 my @reply;
3000
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3001 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 3002 @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 } 3003 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
2495 } else { 3008 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 } 3010 }
2498 3011
2499 cf::override; 3012 cf::override;
… …
2546our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2547our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2548 3061
2549$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2550 3063
2551$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3064$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math
3066 grepstart grepwhile mapstart mapwhile
3067 sort time
3068));
2552 3069
2553# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2554 3071
2555=pod 3072=pod
2556 3073
2557The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2558 3075
2559 cf::object contr pay_amount pay_player map 3076 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split
3079
2560 cf::object::player player 3080 cf::object::player
2561 cf::player peaceful 3081 player
2562 cf::map trigger 3082
3083 cf::player
3084 peaceful
3085
3086 cf::map
3087 trigger
2563 3088
2564=cut 3089=cut
2565 3090
2566for ( 3091for (
2567 ["cf::object" => qw(contr pay_amount pay_player map)], 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)],
2568 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2571) { 3098) {
2572 no strict 'refs'; 3099 no strict 'refs';
… …
2648# the server's init and main functions 3175# the server's init and main functions
2649 3176
2650sub load_facedata($) { 3177sub load_facedata($) {
2651 my ($path) = @_; 3178 my ($path) = @_;
2652 3179
3180 # HACK to clear player env face cache, we need some signal framework
3181 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = ();
3183
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185
2653 warn "loading facedata from $path\n"; 3186 warn "loading facedata from $path\n";
2654 3187
2655 my $facedata; 3188 my $facedata;
2656 0 < aio_load $path, $facedata 3189 0 < aio_load $path, $facedata
2657 or die "$path: $!"; 3190 or die "$path: $!";
… …
2659 $facedata = Coro::Storable::thaw $facedata; 3192 $facedata = Coro::Storable::thaw $facedata;
2660 3193
2661 $facedata->{version} == 2 3194 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed."; 3195 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663 3196
3197 # patch in the exptable
3198 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3201 };
3202 cf::cede_to_tick;
3203
2664 { 3204 {
2665 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
2666 3206
2667 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672 Coro::cede; 3214
3215 cf::cede_to_tick;
2673 } 3216 }
2674 3217
2675 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
2677 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
2678 or next; 3222 or next;
3223
2679 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 3227 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 3229 }
2684 Coro::cede; 3230
3231 cf::cede_to_tick;
2685 } 3232 }
2686 } 3233 }
2687 3234
2688 { 3235 {
2689 my $anims = $facedata->{animinfo}; 3236 my $anims = $facedata->{animinfo};
2690 3237
2691 while (my ($anim, $info) = each %$anims) { 3238 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3239 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 3240 cf::cede_to_tick;
2694 } 3241 }
2695 3242
2696 cf::anim::invalidate_all; # d'oh 3243 cf::anim::invalidate_all; # d'oh
2697 } 3244 }
2698 3245
3246 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource};
3250
3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255
3256 if ($info->{type} & 1) {
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type};
3271 } else {
3272 $RESOURCE{$name} = $info;
3273 }
3274
3275 cf::cede_to_tick;
3276 }
3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280
2699 1 3281 1
2700} 3282}
2701 3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303
3304register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_;
3306
3307 while (my ($k, $v) = each %$want) {
3308 $ns->fx_want ($k, $v);
3309 }
3310};
3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3321
2702sub reload_regions { 3322sub reload_regions {
3323 # HACK to clear player env face cache, we need some signal framework
3324 # for this (global event?)
3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3326
2703 load_resource_file "$MAPDIR/regions" 3327 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n"; 3328 or die "unable to load regions file\n";
3329
3330 for (cf::region::list) {
3331 $_->{match} = qr/$_->{match}/
3332 if exists $_->{match};
3333 }
2705} 3334}
2706 3335
2707sub reload_facedata { 3336sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 3337 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 3338 or die "unable to load facedata\n";
2710} 3339}
2711 3340
2712sub reload_archetypes { 3341sub reload_archetypes {
2713 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
2715 #d# NEED to laod twice to resolve forward references
2716 # this really needs to be done in an extra post-pass
2717 # (which needs to be synchronous, so solve it differently)
2718 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n";
2720} 3344}
2721 3345
2722sub reload_treasures { 3346sub reload_treasures {
2723 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
2724 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
2725} 3349}
2726 3350
2727sub reload_resources { 3351sub reload_resources {
2728 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
2729 3353
3354 reload_facedata;
3355 reload_archetypes;
2730 reload_regions; 3356 reload_regions;
2731 reload_facedata;
2732 #reload_archetypes;#d#
2733 reload_archetypes;
2734 reload_treasures; 3357 reload_treasures;
2735 3358
2736 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
2737} 3360}
2738 3361
2739sub init { 3362sub reload_config {
2740 reload_resources;
2741}
2742
2743sub cfg_load {
2744 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
2745 or return; 3364 or return;
2746 3365
2747 local $/; 3366 local $/;
2748 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
2749 3368
2750 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2751 3370
2752 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2753 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2759 }; 3378 };
2760 warn $@ if $@; 3379 warn $@ if $@;
2761 } 3380 }
2762} 3381}
2763 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
2764sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
2765 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
2766 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
2767 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2768 (async { 3421 (async {
2769 Event::one_event; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT;
2770 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
2771 }; 3425 };
2772 3426
2773 cfg_load; 3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3431 reload_config;
2774 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
2775 load_extensions; 3445 load_extensions;
2776 3446
2777 $TICK_WATCHER->start; 3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
2778 Event::loop; 3455 EV::loop;
2779} 3456}
2780 3457
2781############################################################################# 3458#############################################################################
2782# initialisation and cleanup 3459# initialisation and cleanup
2783 3460
2784# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
2785BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
2786 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
2787 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2788 reentrant => 0,
2789 data => WF_AUTOCANCEL,
2790 signal => $signal,
2791 prio => 0,
2792 cb => sub {
2793 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
2794 },
2795 ); 3467 };
2796 } 3468 }
2797} 3469}
2798 3470
2799sub write_runtime { 3471sub write_runtime_sync {
2800 my $runtime = "$LOCALDIR/runtime";
2801
2802 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
2803 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
2804 3474
2805 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2806 3476
2807 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
2808 3478
2809 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2810 or return; 3480 or return;
2811 3481
2812 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
2813 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
2814 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
… …
2824 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
2825 3495
2826 close $fh 3496 close $fh
2827 or return; 3497 or return;
2828 3498
2829 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2830 and return; 3500 and return;
2831 3501
2832 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
2833 3503
2834 1 3504 1
3505}
3506
3507our $uuid_lock;
3508our $uuid_skip;
3509
3510sub write_uuid_sync($) {
3511 $uuid_skip ||= $_[0];
3512
3513 return if $uuid_lock;
3514 local $uuid_lock = 1;
3515
3516 my $uuid = "$LOCALDIR/uuid";
3517
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return;
3520
3521 my $value = uuid_seq uuid_cur;
3522
3523 if ($value < 1024) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0;
3530
3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3532 and return;
3533
3534 # always fsync - this file is important
3535 aio_fsync $fh
3536 and return;
3537
3538 close $fh
3539 or return;
3540
3541 aio_rename "$uuid~", $uuid
3542 and return;
3543
3544 warn "uuid file written ($value).\n";
3545
3546 1
3547
3548}
3549
3550sub write_uuid($$) {
3551 my ($skip, $sync) = @_;
3552
3553 $sync ? write_uuid_sync $skip
3554 : async { write_uuid_sync $skip };
2835} 3555}
2836 3556
2837sub emergency_save() { 3557sub emergency_save() {
2838 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
2839 3559
… …
2845 # and maps saved/destroyed asynchronously. 3565 # and maps saved/destroyed asynchronously.
2846 warn "begin emergency player save\n"; 3566 warn "begin emergency player save\n";
2847 for my $login (keys %cf::PLAYER) { 3567 for my $login (keys %cf::PLAYER) {
2848 my $pl = $cf::PLAYER{$login} or next; 3568 my $pl = $cf::PLAYER{$login} or next;
2849 $pl->valid or next; 3569 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2850 $pl->save; 3571 $pl->save;
2851 } 3572 }
2852 warn "end emergency player save\n"; 3573 warn "end emergency player save\n";
2853 3574
2854 warn "begin emergency map save\n"; 3575 warn "begin emergency map save\n";
… …
2860 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
2861 3582
2862 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
2863 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
2864 warn "end emergency database checkpoint\n"; 3585 warn "end emergency database checkpoint\n";
3586
3587 warn "begin write uuid\n";
3588 write_uuid_sync 1;
3589 warn "end write uuid\n";
2865 }; 3590 };
2866 3591
2867 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
2868} 3593}
2869 3594
2870sub post_cleanup { 3595sub post_cleanup {
2871 my ($make_core) = @_; 3596 my ($make_core) = @_;
2872 3597
2873 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
2874 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
2875} 3629}
2876 3630
2877sub do_reload_perl() { 3631sub do_reload_perl() {
2878 # can/must only be called in main 3632 # can/must only be called in main
2879 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
2880 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
2881 return; 3635 return;
2882 } 3636 }
2883 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
2884 warn "reloading..."; 3641 warn "reloading...";
2885 3642
2886 warn "entering sync_job"; 3643 warn "entering sync_job";
2887 3644
2888 cf::sync_job { 3645 cf::sync_job {
2889 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
2890 cf::emergency_save; 3647 cf::emergency_save;
2891 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
2892 3649
2893 warn "syncing database to disk"; 3650 warn "syncing database to disk";
2894 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
2895 3652
2896 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
2897 3654
2898 warn "cancelling all WF_AUTOCANCEL watchers";
2899 for (Event::all_watchers) {
2900 $_->cancel if $_->data & WF_AUTOCANCEL;
2901 }
2902
2903 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
2904 for (;;) {
2905 BDB::flush;
2906 IO::AIO::flush;
2907 Coro::cede;
2908 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
2909 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2910 }
2911
2912 ++$RELOAD;
2913
2914 warn "cancelling all extension coros";
2915 $_->cancel for values %EXT_CORO;
2916 %EXT_CORO = ();
2917
2918 warn "removing commands";
2919 %COMMAND = ();
2920
2921 warn "removing ext/exti commands";
2922 %EXTCMD = ();
2923 %EXTICMD = ();
2924
2925 warn "unloading/nuking all extensions";
2926 for my $pkg (@EXTS) {
2927 warn "... unloading $pkg";
2928
2929 if (my $cb = $pkg->can ("unload")) {
2930 eval {
2931 $cb->($pkg);
2932 1
2933 } or warn "$pkg unloaded, but with errors: $@";
2934 } 3658 }
2935 3659
2936 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
2937 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
2938 } 3662 %EXT_CORO = ();
2939 3663
2940 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
2941 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
2942 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2943 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
2944 warn "... unloading $k"; 3673 warn "... unloading $pkg";
2945 delete $INC{$k};
2946 3674
2947 $k =~ s/\.pm$//;
2948 $k =~ s/\//::/g;
2949
2950 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
2951 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
2952 } 3684 }
2953 3685
2954 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
2955 } 3701 }
2956 3702
2957 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
2958 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
2959 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2960 3706
2961 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
2962 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
2963 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
2964 3710
2965 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
2966 # and global variables created in xs 3712 # and global variables created in xs
2967 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
2968 3714
2969 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
2970 3716
2971 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
2972 require cf; 3718 require cf;
2973 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2974 3720
2975 warn "loading config and database again"; 3721 warn "loading config and database again";
2976 cf::cfg_load; 3722 cf::reload_config;
2977 3723
2978 warn "loading extensions"; 3724 warn "loading extensions";
2979 cf::load_extensions; 3725 cf::load_extensions;
2980 3726
2981 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
2982 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
2983 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
2984 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
2985 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
2986 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
2987 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
2988 warn "leaving sync_job"; 3737 warn "leaving sync_job";
2989 3738
2990 1 3739 1
2991 } or do { 3740 } or do {
2992 warn $@; 3741 warn $@;
2993 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
2994 exit 1;
2995 }; 3743 };
2996 3744
2997 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
2998}; 3748};
2999 3749
3000our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3001 3751
3002sub reload_perl() { 3752sub reload_perl() {
3003 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3004 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3005 3755
3006 $RELOAD_WATCHER ||= Event->timer ( 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3007 reentrant => 0,
3008 after => 0,
3009 data => WF_AUTOCANCEL,
3010 cb => sub {
3011 do_reload_perl; 3757 do_reload_perl;
3012 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3013 },
3014 ); 3759 };
3015} 3760}
3016 3761
3017register_command "reload" => sub { 3762register_command "reload" => sub {
3018 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
3019 3764
3020 if ($who->flag (FLAG_WIZ)) { 3765 if ($who->flag (FLAG_WIZ)) {
3021 $who->message ("reloading server."); 3766 $who->message ("reloading server.");
3767 async {
3768 $Coro::current->{desc} = "perl_reload";
3022 async { reload_perl }; 3769 reload_perl;
3770 };
3023 } 3771 }
3024}; 3772};
3025 3773
3026unshift @INC, $LIBDIR; 3774unshift @INC, $LIBDIR;
3027 3775
… …
3029 3777
3030our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3031our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3032 3780
3033sub wait_for_tick { 3781sub wait_for_tick {
3034 return unless $TICK_WATCHER->is_active;
3035 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3036 3783
3037 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3038 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3039 $signal->wait; 3786 $signal->wait;
3040} 3787}
3041 3788
3042sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3043 return unless $TICK_WATCHER->is_active;
3044 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3045 3791
3046 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3047 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3048 $signal->wait; 3794 $signal->wait;
3049} 3795}
3050 3796
3051 my $min = 1e6;#d# 3797sub tick {
3052 my $avg = 10;
3053$TICK_WATCHER = Event->timer (
3054 reentrant => 0,
3055 parked => 1,
3056 prio => 0,
3057 at => $NEXT_TICK || $TICK,
3058 data => WF_AUTOCANCEL,
3059 cb => sub {
3060 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
3061 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3799 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3062 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
3063 return; 3801 return;
3064 } 3802 }
3065 3803
3066 $NOW = $tick_start = Event::time;
3067
3068 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
3069 3805
3070 0 && sync_job {#d# 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3071 for(1..10) { 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3072 my $t = Event::time; 3808 Coro::async_pool {
3073 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3809 $Coro::current->{desc} = "runtime saver";
3074 or die; 3810 write_runtime_sync
3075 3811 or warn "ERROR: unable to write runtime file: $!";
3076 $map->width (50);
3077 $map->height (50);
3078 $map->alloc;
3079 $map->_load_objects ("/tmp/x.map", 1);
3080 my $t = Event::time - $t;
3081
3082 #next unless $t < 0.0013;#d#
3083 if ($t < $min) {
3084 $min = $t;
3085 }
3086 $avg = $avg * 0.99 + $t * 0.01;
3087 }
3088 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3089 exit 0;
3090 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3091 }; 3812 };
3813 }
3092 3814
3093 $RUNTIME += $TICK;
3094 $NEXT_TICK += $TICK;
3095
3096 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3097 $NEXT_RUNTIME_WRITE = $NOW + 10;
3098 Coro::async_pool {
3099 write_runtime
3100 or warn "ERROR: unable to write runtime file: $!";
3101 };
3102 }
3103
3104# my $AFTER = Event::time;
3105# warn $AFTER - $NOW;#d#
3106
3107 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3108 $sig->send; 3816 $sig->send;
3109 } 3817 }
3110 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
3111 $sig->send; 3819 $sig->send;
3112 } 3820 }
3113 3821
3114 $NOW = Event::time; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
3115
3116 # if we are delayed by four ticks or more, skip them all
3117 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3118
3119 $TICK_WATCHER->at ($NEXT_TICK);
3120 $TICK_WATCHER->start;
3121
3122 $LOAD = ($NOW - $tick_start) / $TICK;
3123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3124 3824
3125 _post_tick; 3825 if (0) {
3126 3826 if ($NEXT_TICK) {
3127 3827 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d#
3830 }
3128 }, 3831 }
3129); 3832}
3130 3833
3131{ 3834{
3132 BDB::max_poll_time $TICK * 0.1; 3835 # configure BDB
3133 $BDB_POLL_WATCHER = Event->io ( 3836
3134 reentrant => 0,
3135 fd => BDB::poll_fileno,
3136 poll => 'r',
3137 prio => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => \&BDB::poll_cb,
3140 );
3141 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3142 3838 BDB::max_poll_reqs $TICK * 0.1;
3143 BDB::set_sync_prepare { 3839 $AnyEvent::BDB::WATCHER->priority (1);
3144 my $status;
3145 my $current = $Coro::current;
3146 (
3147 sub {
3148 $status = $!;
3149 $current->ready; undef $current;
3150 },
3151 sub {
3152 Coro::schedule while defined $current;
3153 $! = $status;
3154 },
3155 )
3156 };
3157 3840
3158 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3159 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3160 3848
3161 cf::sync_job { 3849 cf::sync_job {
3162 eval { 3850 eval {
3163 BDB::db_env_open 3851 BDB::db_env_open
3164 $DB_ENV, 3852 $DB_ENV,
… …
3166 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3854 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3167 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3855 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3168 0666; 3856 0666;
3169 3857
3170 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3858 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3171
3172 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3173 $DB_ENV->set_lk_detect;
3174 }; 3859 };
3175 3860
3176 cf::cleanup "db_env_open(db): $@" if $@; 3861 cf::cleanup "db_env_open(db): $@" if $@;
3177 }; 3862 };
3178 } 3863 }
3864
3865 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3866 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3867 };
3868 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3870 };
3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3873 };
3179} 3874}
3180 3875
3181{ 3876{
3877 # configure IO::AIO
3878
3182 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3183
3184 undef $Coro::AIO::WATCHER;
3185 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3186 $AIO_POLL_WATCHER = Event->io ( 3881 undef $AnyEvent::AIO::WATCHER;
3187 reentrant => 0,
3188 data => WF_AUTOCANCEL,
3189 fd => IO::AIO::poll_fileno,
3190 poll => 'r',
3191 prio => 6,
3192 cb => \&IO::AIO::poll_cb,
3193 );
3194} 3882}
3195 3883
3196my $_log_backtrace; 3884my $_log_backtrace;
3197 3885
3198sub _log_backtrace { 3886sub _log_backtrace {
… …
3201 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3202 3890
3203 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3204 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3205 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3206 async { 3895 async {
3896 $Coro::current->{desc} = "abt $msg";
3897
3207 my @bt = fork_call { 3898 my @bt = fork_call {
3208 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3209 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3900 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3210 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3901 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3211 or die "addr2line: $!"; 3902 or die "addr2line: $!";
… …
3219 } 3910 }
3220 3911
3221 @funcs 3912 @funcs
3222 }; 3913 };
3223 3914
3224 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3225 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3226 --$_log_backtrace; 3918 --$_log_backtrace;
3227 }; 3919 };
3228 } else { 3920 } else {
3229 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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