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

Diff Legend

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