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.139 by root, Fri Jan 5 19:12:03 2007 UTC vs.
Revision 1.156 by root, Tue Jan 9 22:07:08 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
… …
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 61
57binmode STDOUT; 62binmode STDOUT;
58binmode STDERR; 63binmode STDERR;
59 64
60# read virtual server time, if available 65# read virtual server time, if available
… …
105=item %cf::CFG 110=item %cf::CFG
106 111
107Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 113from wherever your confdir points to.
109 114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
121
110=back 122=back
111 123
112=cut 124=cut
113 125
114BEGIN { 126BEGIN {
… …
117 utf8::encode $msg; 129 utf8::encode $msg;
118 130
119 $msg .= "\n" 131 $msg .= "\n"
120 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
121 133
122 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
123 }; 135 };
124} 136}
125 137
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
153 165
154=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
155 167
156=over 4 168=over 4
157 169
170=item dumpval $ref
171
158=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
159 192
160use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
161 194
162=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
163 196
… …
228 261
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 262 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop; 263 $TICK_WATCHER->stop;
231 $guard 264 $guard
232} 265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
233 276
234=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
235 278
236The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
… …
256 my $freeze_guard = freeze_mainloop; 299 my $freeze_guard = freeze_mainloop;
257 300
258 my $busy = 1; 301 my $busy = 1;
259 my @res; 302 my @res;
260 303
261 (Coro::async_pool { 304 (async {
262 @res = eval { $job->() }; 305 @res = eval { $job->() };
263 warn $@ if $@; 306 warn $@ if $@;
264 undef $busy; 307 undef $busy;
265 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
266 309
267 while ($busy) { 310 while ($busy) {
268 unless (Coro::cede) { 311 Coro::cede or Event::one_event;
269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
271 }
272 } 312 }
273 313
274 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
275 } else { 315 } else {
276 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
277 317
278 $job->() 318 $job->()
279 } 319 }
280} 320}
281 321
282=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
283 323
284Creates (and readies) and returns a new coro. This coro is automcatially 324Like async, but this coro is automcatially being canceled when the
285being canceled when the extension calling this is being unloaded. 325extension calling this is being unloaded.
286 326
287=cut 327=cut
288 328
289sub coro(&) { 329sub async_ext(&) {
290 my $cb = shift; 330 my $cb = shift;
291 331
292 my $coro = &Coro::async_pool ($cb); 332 my $coro = &Coro::async ($cb);
293 333
294 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
295 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
296 }); 336 });
297 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
… …
326=cut 366=cut
327 367
328############################################################################# 368#############################################################################
329 369
330package cf::path; 370package cf::path;
371
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
331 374
332sub new { 375sub new {
333 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
334 377
335 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
… …
399# } 442# }
400} 443}
401 444
402# escape the /'s in the path 445# escape the /'s in the path
403sub _escaped_path { 446sub _escaped_path {
404 # ∕ is U+2215
405 (my $path = $_[0]{path}) =~ s/\//∕/g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
406 $path 448 $path
407} 449}
408 450
409# the original (read-only) location 451# the original (read-only) location
410sub load_path { 452sub load_path {
… …
1037}; 1079};
1038 1080
1039cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1040 1082
1041############################################################################# 1083#############################################################################
1042# load/save perl data associated with player->ob objects
1043
1044sub all_objects(@) {
1045 @_, map all_objects ($_->inv), @_
1046}
1047
1048# TODO: compatibility cruft, remove when no longer needed
1049cf::player->attach (
1050 on_load => sub {
1051 my ($pl, $path) = @_;
1052
1053 for my $o (all_objects $pl->ob) {
1054 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1055 $o->set_ob_key_value ("_perl_data");
1056
1057 %$o = %{ Storable::thaw pack "H*", $value };
1058 }
1059 }
1060 },
1061);
1062
1063#############################################################################
1064 1084
1065=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1066 1086
1067Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1068 1088
1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1069=head3 cf::player 1095=head3 cf::player
1070 1096
1071=over 4 1097=over 4
1072 1098
1073=item cf::player::exists $login 1099=item cf::player::find $login
1074 1100
1075Returns true when the given account exists. 1101Returns the given player object, loading it if necessary (might block).
1076 1102
1077=cut 1103=cut
1078 1104
1079sub cf::player::exists($) { 1105sub playerdir($) {
1080 cf::player::find $_[0] 1106 cf::localdir
1081 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1107 . "/"
1108 . cf::playerdir
1109 . "/"
1110 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1111}
1112
1113sub path($) {
1114 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1115
1116 (playerdir $login) . "/$login.pl"
1117}
1118
1119sub find_active($) {
1120 $cf::PLAYER{$_[0]}
1121 and $cf::PLAYER{$_[0]}->active
1122 and $cf::PLAYER{$_[0]}
1123}
1124
1125sub exists($) {
1126 my ($login) = @_;
1127
1128 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login }
1130}
1131
1132sub find($) {
1133 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0];
1135
1136 my $guard = cf::lock_acquire "user_find:$login";
1137
1138 $cf::PLAYER{$_[0]} || do {
1139 my $pl = load_pl path $login
1140 or return;
1141 $cf::PLAYER{$login} = $pl
1142 }
1143 }
1144}
1145
1146sub save($) {
1147 my ($pl) = @_;
1148
1149 return if $pl->{deny_save};
1150
1151 my $path = path $pl;
1152 my $guard = cf::lock_acquire "user_save:$path";
1153
1154 return if $pl->{deny_save};
1155
1156 aio_mkdir playerdir $pl, 0770;
1157 $pl->{last_save} = $cf::RUNTIME;
1158
1159 $pl->save_pl ($path);
1160 Coro::cede;
1161}
1162
1163sub new($) {
1164 my ($login) = @_;
1165
1166 my $self = create;
1167
1168 $self->ob->name ($login);
1169 $self->{deny_save} = 1;
1170
1171 $cf::PLAYER{$login} = $self;
1172
1173 $self
1174}
1175
1176=item $pl->quit_character
1177
1178Nukes the player without looking back. If logged in, the connection will
1179be destroyed. May block for a long time.
1180
1181=cut
1182
1183sub quit_character {
1184 my ($pl) = @_;
1185
1186 $pl->{deny_save} = 1;
1187 $pl->password ("*"); # this should lock out the player until we nuked the dir
1188
1189 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1190 $pl->deactivate;
1191 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1192 $pl->ns->destroy if $pl->ns;
1193
1194 my $path = playerdir $pl;
1195 my $temp = "$path~$cf::RUNTIME~deleting~";
1196 aio_rename $path, $temp;
1197 delete $cf::PLAYER{$pl->ob->name};
1198 $pl->destroy;
1199 IO::AIO::aio_rmtree $temp;
1200}
1201
1202=item cf::player::list_logins
1203
1204Returns am arrayref of all valid playernames in the system, can take a
1205while and may block, so not sync_job-capable, ever.
1206
1207=cut
1208
1209sub list_logins {
1210 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1211 or return [];
1212
1213 my @logins;
1214
1215 for my $login (@$dirs) {
1216 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1217 aio_read $fh, 0, 512, my $buf, 0 or next;
1218 $buf !~ /^password -------------$/m or next; # official not-valid tag
1219
1220 utf8::decode $login;
1221 push @logins, $login;
1222 }
1223
1224 \@logins
1225}
1226
1227=item $player->maps
1228
1229Returns an arrayref of cf::path's of all maps that are private for this
1230player. May block.
1231
1232=cut
1233
1234sub maps($) {
1235 my ($pl) = @_;
1236
1237 my $files = aio_readdir playerdir $pl
1238 or return;
1239
1240 my @paths;
1241
1242 for (@$files) {
1243 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/;
1246
1247 s/$PATH_SEP/\//g;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1082} 1252}
1083 1253
1084=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1085 1255
1086Sends an ext reply to the player. 1256Sends an ext reply to the player.
1087 1257
1088=cut 1258=cut
1089 1259
1090sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1091 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1092 1262
1093 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1094 1264
1095 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1096} 1266}
1267
1268package cf;
1097 1269
1098=back 1270=back
1099 1271
1100 1272
1101=head3 cf::map 1273=head3 cf::map
… …
1270} 1442}
1271 1443
1272sub find_sync { 1444sub find_sync {
1273 my ($path, $origin) = @_; 1445 my ($path, $origin) = @_;
1274 1446
1275 cf::sync_job { 1447 cf::sync_job { cf::map::find $path, $origin }
1276 my $map = cf::map::find $path, $origin;
1277 $map
1278 }
1279} 1448}
1280 1449
1281sub do_load_sync { 1450sub do_load_sync {
1282 my ($map) = @_; 1451 my ($map) = @_;
1283 1452
… …
1299 $self->{load_path} = $save; 1468 $self->{load_path} = $save;
1300 1469
1301 return if $self->{deny_save}; 1470 return if $self->{deny_save};
1302 1471
1303 local $self->{last_access} = $self->last_access;#d# 1472 local $self->{last_access} = $self->last_access;#d#
1473
1474 cf::async {
1475 $_->contr->save for $self->players;
1476 };
1304 1477
1305 if ($uniq) { 1478 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1480 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1481 } else {
… …
1403 } 1576 }
1404 1577
1405 $map 1578 $map
1406} 1579}
1407 1580
1408sub emergency_save {
1409 my $freeze_guard = cf::freeze_mainloop;
1410
1411 warn "enter emergency map save\n";
1412
1413 cf::sync_job {
1414 warn "begin emergency map save\n";
1415 $_->save for values %cf::MAP;
1416 };
1417
1418 warn "end emergency map save\n";
1419}
1420
1421package cf; 1581package cf;
1422 1582
1423=back 1583=back
1424 1584
1585=head3 cf::object
1586
1587=cut
1588
1589package cf::object;
1590
1591=over 4
1592
1593=item $ob->inv_recursive
1594
1595Returns the inventory of the object _and_ their inventories, recursively.
1596
1597=cut
1598
1599sub inv_recursive_;
1600sub inv_recursive_ {
1601 map { $_, inv_recursive_ $_->inv } @_
1602}
1603
1604sub inv_recursive {
1605 inv_recursive_ inv $_[0]
1606}
1607
1608package cf;
1609
1610=back
1425 1611
1426=head3 cf::object::player 1612=head3 cf::object::player
1427 1613
1428=over 4 1614=over 4
1429 1615
… …
1522 ($x, $y) = ($map->enter_x, $map->enter_y) 1708 ($x, $y) = ($map->enter_x, $map->enter_y)
1523 if $x <=0 && $y <= 0; 1709 if $x <=0 && $y <= 0;
1524 1710
1525 $map->load; 1711 $map->load;
1526 1712
1713 return unless $self->contr->active;
1527 $self->activate_recursive; 1714 $self->activate_recursive;
1528 $self->enter_map ($map, $x, $y); 1715 $self->enter_map ($map, $x, $y);
1529} 1716}
1530 1717
1531cf::player->attach ( 1718cf::player->attach (
… …
1543 my ($pl) = @_; 1730 my ($pl) = @_;
1544 1731
1545 # try to abort aborted map switching on player login :) 1732 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes 1733 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) { 1734 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link; 1735 $pl->ob->enter_link;
1550 (Coro::async_pool { 1736 (async {
1551 # we need this sleep as the login has a concurrent enter_exit running 1737 # we need this sleep as the login has a concurrent enter_exit running
1552 # and this sleep increases chances of the player not ending up in scorn 1738 # and this sleep increases chances of the player not ending up in scorn
1739 $pl->ob->reply (undef,
1740 "There was an internal problem at your last logout, "
1741 . "the server will try to bring you to your intended destination in a second.",
1742 cf::NDI_RED);
1553 Coro::Timer::sleep 1; 1743 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link; 1744 $pl->ob->leave_link;
1555 })->prio (2); 1745 })->prio (2);
1556 } 1746 }
1557 }, 1747 },
… …
1562=cut 1752=cut
1563 1753
1564sub cf::object::player::goto { 1754sub cf::object::player::goto {
1565 my ($self, $path, $x, $y) = @_; 1755 my ($self, $path, $x, $y) = @_;
1566 1756
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1567 $self->enter_link; 1760 $self->enter_link;
1568 1761
1569 (Coro::async_pool { 1762 (async {
1570 $path = new cf::path $path;
1571
1572 my $map = cf::map::find $path->as_string; 1763 my $map = cf::map::find $path->as_string;
1573 $map = $map->customise_for ($self) if $map; 1764 $map = $map->customise_for ($self) if $map;
1574 1765
1575# warn "entering ", $map->path, " at ($x, $y)\n" 1766# warn "entering ", $map->path, " at ($x, $y)\n"
1576# if $map; 1767# if $map;
1577 1768
1578 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1769 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1579 1770
1580 $self->leave_link ($map, $x, $y); 1771 $self->leave_link ($map, $x, $y);
1581 })->prio (1); 1772 })->prio (1);
1582} 1773}
1583 1774
… …
1636 1827
1637 return unless $self->type == cf::PLAYER; 1828 return unless $self->type == cf::PLAYER;
1638 1829
1639 $self->enter_link; 1830 $self->enter_link;
1640 1831
1641 (Coro::async_pool { 1832 (async {
1642 $self->deactivate_recursive; # just to be sure 1833 $self->deactivate_recursive; # just to be sure
1643 unless (eval { 1834 unless (eval {
1644 prepare_random_map $exit 1835 prepare_random_map $exit
1645 if $exit->slaying eq "/!"; 1836 if $exit->slaying eq "/!";
1646 1837
… …
1727 } 1918 }
1728 } 1919 }
1729 }, 1920 },
1730); 1921);
1731 1922
1732=item $client->coro (\&cb) 1923=item $client->async (\&cb)
1733 1924
1734Create a new coroutine, running the specified callback. The coroutine will 1925Create a new coroutine, running the specified callback. The coroutine will
1735be automatically cancelled when the client gets destroyed (e.g. on logout, 1926be automatically cancelled when the client gets destroyed (e.g. on logout,
1736or loss of connection). 1927or loss of connection).
1737 1928
1738=cut 1929=cut
1739 1930
1740sub cf::client::coro { 1931sub cf::client::async {
1741 my ($self, $cb) = @_; 1932 my ($self, $cb) = @_;
1742 1933
1743 my $coro = &Coro::async_pool ($cb); 1934 my $coro = &Coro::async ($cb);
1744 1935
1745 $coro->on_destroy (sub { 1936 $coro->on_destroy (sub {
1746 delete $self->{_coro}{$coro+0}; 1937 delete $self->{_coro}{$coro+0};
1747 }); 1938 });
1748 1939
… …
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2182 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2183 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993 2184
1994 if (exists $CFG{mlockall}) { 2185 if (exists $CFG{mlockall}) {
1995 eval { 2186 eval {
1996 $CFG{mlockall} ? &mlockall : &munlockall 2187 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1997 and die "WARNING: m(un)lockall failed: $!\n"; 2188 and die "WARNING: m(un)lockall failed: $!\n";
1998 }; 2189 };
1999 warn $@ if $@; 2190 warn $@ if $@;
2000 } 2191 }
2001} 2192}
2002 2193
2003sub main { 2194sub main {
2004 # we must not ever block the main coroutine 2195 # we must not ever block the main coroutine
2005 local $Coro::idle = sub { 2196 local $Coro::idle = sub {
2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2007 Coro::async_pool { Event::one_event }; 2198 async { Event::one_event };
2008 }; 2199 };
2009 2200
2010 cfg_load; 2201 cfg_load;
2011 db_load; 2202 db_load;
2012 load_extensions; 2203 load_extensions;
2013 Event::loop; 2204 Event::loop;
2014} 2205}
2015 2206
2016############################################################################# 2207#############################################################################
2017# initialisation 2208# initialisation and cleanup
2209
2210# install some emergency cleanup handlers
2211BEGIN {
2212 for my $signal (qw(INT HUP TERM)) {
2213 Event->signal (
2214 data => WF_AUTOCANCEL,
2215 signal => $signal,
2216 cb => sub {
2217 cf::cleanup "SIG$signal";
2218 },
2219 );
2220 }
2221}
2222
2223sub emergency_save() {
2224 my $freeze_guard = cf::freeze_mainloop;
2225
2226 warn "enter emergency perl save\n";
2227
2228 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously.
2232 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next;
2236 $pl->save;
2237 }
2238 warn "end emergency player save\n";
2239
2240 warn "begin emergency map save\n";
2241 for my $path (keys %cf::MAP) {
2242 my $map = $cf::MAP{$path} or next;
2243 $map->valid or next;
2244 $map->save;
2245 }
2246 warn "end emergency map save\n";
2247 };
2248
2249 warn "leave emergency perl save\n";
2250}
2018 2251
2019sub reload() { 2252sub reload() {
2020 # can/must only be called in main 2253 # can/must only be called in main
2021 if ($Coro::current != $Coro::main) { 2254 if ($Coro::current != $Coro::main) {
2022 warn "can only reload from main coroutine\n"; 2255 warn "can only reload from main coroutine\n";
… …
2095 cf::load_extensions; 2328 cf::load_extensions;
2096 2329
2097 # reattach attachments to objects 2330 # reattach attachments to objects
2098 warn "reattach"; 2331 warn "reattach";
2099 _global_reattach; 2332 _global_reattach;
2333 reattach $_ for values %MAP;
2100 }; 2334 };
2101 2335
2102 if ($@) { 2336 if ($@) {
2103 warn $@; 2337 warn $@;
2104 warn "error while reloading, exiting."; 2338 warn "error while reloading, exiting.";
… …
2120 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2354 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2121 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2355 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2122 2356
2123 # dirty hack because... archetypes are not yet loaded 2357 # dirty hack because... archetypes are not yet loaded
2124 Event->timer ( 2358 Event->timer (
2125 after => 2, 2359 after => 10,
2126 cb => sub { 2360 cb => sub {
2127 $_[0]->w->cancel; 2361 $_[0]->w->cancel;
2128 2362
2129 # provide some exits "home" 2363 # provide some exits "home"
2130 my $exit = cf::object::new "exit"; 2364 my $exit = cf::object::new "exit";
… …
2172 data => WF_AUTOCANCEL, 2406 data => WF_AUTOCANCEL,
2173 cb => sub { 2407 cb => sub {
2174 cf::server_tick; # one server iteration 2408 cf::server_tick; # one server iteration
2175 $RUNTIME += $TICK; 2409 $RUNTIME += $TICK;
2176 $NEXT_TICK += $TICK; 2410 $NEXT_TICK += $TICK;
2411
2412 $WAIT_FOR_TICK->broadcast;
2413 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2177 2414
2178 # if we are delayed by four ticks or more, skip them all 2415 # if we are delayed by four ticks or more, skip them all
2179 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2416 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2180 2417
2181 $TICK_WATCHER->at ($NEXT_TICK); 2418 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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