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

Diff Legend

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