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.127 by root, Wed Jan 3 00:05:26 2007 UTC vs.
Revision 1.141 by root, Fri Jan 5 20:08:53 2007 UTC

… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 184=item cf::lock_wait $string
209 185
210Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
211 187
212=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
213 189
214Wait until the given lock is available and then acquires it and returns 190Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
217returned. 193returned.
218 194
219Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
221 197
222=cut 198=cut
223 199
224our %LOCK; 200our %LOCK;
225 201
… …
239 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
240 lock_wait $key; 216 lock_wait $key;
241 217
242 $LOCK{$key} = []; 218 $LOCK{$key} = [];
243 219
244 cf::guard { 220 Coro::guard {
245 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
247 } 223 }
248} 224}
249 225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
250=item cf::async { BLOCK } 234=item cf::async { BLOCK }
251 235
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 236Currently the same as Coro::async_pool, meaning you cannot use
253error instead of exiting the server in case of a problem. 237C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
238thing you are allowed to do is call C<prio> on it.
254 239
255=cut 240=cut
256 241
257sub async(&) { 242BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 243
266=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
267 245
268The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
… …
283 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
285 263
286 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 265 # (but this is cancel-safe)
288 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
289 267
290 my $busy = 1; 268 my $busy = 1;
291 my @res; 269 my @res;
292 270
293 (Coro::async { 271 (async {
294 @res = eval { $job->() }; 272 @res = eval { $job->() };
295 warn $@ if $@; 273 warn $@ if $@;
296 undef $busy; 274 undef $busy;
297 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
298 276
299 while ($busy) { 277 while ($busy) {
300 Coro::cede_notself; 278 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 279 }
303 280
304 wantarray ? @res : $res[0] 281 wantarray ? @res : $res[0]
305 } else { 282 } else {
306 # we are in another coroutine, how wonderful, everything just works 283 # we are in another coroutine, how wonderful, everything just works
307 284
308 $job->() 285 $job->()
309 } 286 }
310} 287}
311 288
312=item $coro = cf::coro { BLOCK } 289=item $coro = cf::async_ext { BLOCK }
313 290
314Creates and returns a new coro. This coro is automcatially being canceled 291Like async, but this coro is automcatially being canceled when the
315when the extension calling this is being unloaded. 292extension calling this is being unloaded.
316 293
317=cut 294=cut
318 295
319sub coro(&) { 296sub async_ext(&) {
320 my $cb = shift; 297 my $cb = shift;
321 298
322 my $coro = &cf::async ($cb); 299 my $coro = &Coro::async ($cb);
323 300
324 $coro->on_destroy (sub { 301 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 302 delete $EXT_CORO{$coro+0};
326 }); 303 });
327 $EXT_CORO{$coro+0} = $coro; 304 $EXT_CORO{$coro+0} = $coro;
… …
1137package cf::map; 1114package cf::map;
1138 1115
1139use Fcntl; 1116use Fcntl;
1140use Coro::AIO; 1117use Coro::AIO;
1141 1118
1142our $MAX_RESET = 7200; 1119our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1120our $DEFAULT_RESET = 3000;
1144 1121
1145sub generate_random_map { 1122sub generate_random_map {
1146 my ($path, $rmp) = @_; 1123 my ($path, $rmp) = @_;
1147 1124
1148 # mit "rum" bekleckern, nicht 1125 # mit "rum" bekleckern, nicht
… …
1178 or return; 1155 or return;
1179 1156
1180 my $map = cf::map::new 1157 my $map = cf::map::new
1181 or return; 1158 or return;
1182 1159
1160 # for better error messages only, will be overwritten
1161 $map->path ($path);
1162
1183 $map->load_header ($path) 1163 $map->load_header ($path)
1184 or return; 1164 or return;
1185 1165
1186 $map->{load_path} = $path; 1166 $map->{load_path} = $path;
1187 1167
1188 $map 1168 $map
1189} 1169}
1190 1170
1191sub find_map; 1171sub find;
1192sub find_map { 1172sub find {
1193 my ($path, $origin) = @_; 1173 my ($path, $origin) = @_;
1194 1174
1195 #warn "find_map<$path,$origin>\n";#d# 1175 #warn "find<$path,$origin>\n";#d#
1196 1176
1197 $path = new cf::path $path, $origin && $origin->path; 1177 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1178 my $key = $path->as_string;
1199 1179
1200 cf::lock_wait "map_find:$key"; 1180 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1183 my $guard = cf::lock_acquire "map_find:$key";
1204 1184
1205 # do it the slow way 1185 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1186 my $map = try_load_header $path->save_path;
1207 1187
1188 Coro::cede;
1189
1208 if ($map) { 1190 if ($map) {
1191 $map->last_access ((delete $map->{last_access})
1192 || $cf::RUNTIME); #d#
1209 # safety 1193 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1194 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1195 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1196 } else {
1213 if (my $rmp = $path->random_map_params) { 1197 if (my $rmp = $path->random_map_params) {
… …
1218 1202
1219 $map or return; 1203 $map or return;
1220 1204
1221 $map->{load_original} = 1; 1205 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1206 $map->{instantiate_time} = $cf::RUNTIME;
1207 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1208 $map->instantiate;
1224 1209
1225 # per-player maps become, after loading, normal maps 1210 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1211 $map->per_player (0) if $path->{user_rel};
1227 } 1212 }
1228 1213
1229 $map->path ($key); 1214 $map->path ($key);
1230 $map->{path} = $path; 1215 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1216 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1217
1218 Coro::cede;
1233 1219
1234 if ($map->should_reset) { 1220 if ($map->should_reset) {
1235 $map->reset; 1221 $map->reset;
1236 undef $guard; 1222 undef $guard;
1237 $map = find_map $path 1223 $map = find $path
1238 or return; 1224 or return;
1239 } 1225 }
1240 1226
1241 $cf::MAP{$key} = $map 1227 $cf::MAP{$key} = $map
1242 } 1228 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1250 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1251 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1252 $self->load_objects ($uniq, 0);
1267 } 1253 }
1268 } 1254 }
1255
1256 Coro::cede;
1269 1257
1270 # now do the right thing for maps 1258 # now do the right thing for maps
1271 $self->link_multipart_objects; 1259 $self->link_multipart_objects;
1272 1260
1273 if ($self->{path}->is_style_map) { 1261 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1269 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1270 unless $self->difficulty;
1283 $self->activate; 1271 $self->activate;
1284 } 1272 }
1285 1273
1274 Coro::cede;
1275
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1276 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1277}
1288 1278
1289sub load_map_sync { 1279sub find_sync {
1290 my ($path, $origin) = @_; 1280 my ($path, $origin) = @_;
1291 1281
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1282 cf::sync_job { cf::map::find $path, $origin }
1283}
1293 1284
1294 cf::sync_job { 1285sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1286 my ($map) = @_;
1296 or return; 1287
1297 $map->load; 1288 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1289}
1301 1290
1302sub save { 1291sub save {
1303 my ($self) = @_; 1292 my ($self) = @_;
1304 1293
1294 my $lock = cf::lock_acquire "map_data:" . $self->path;
1295
1305 $self->{last_save} = $cf::RUNTIME; 1296 $self->{last_save} = $cf::RUNTIME;
1306 1297
1307 return unless $self->dirty; 1298 return unless $self->dirty;
1308 1299
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1300 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1301 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1302
1312 $self->{load_path} = $save; 1303 $self->{load_path} = $save;
1313 1304
1314 return if $self->{deny_save}; 1305 return if $self->{deny_save};
1306
1307 local $self->{last_access} = $self->last_access;#d#
1315 1308
1316 if ($uniq) { 1309 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1311 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1312 } else {
… …
1322} 1315}
1323 1316
1324sub swap_out { 1317sub swap_out {
1325 my ($self) = @_; 1318 my ($self) = @_;
1326 1319
1320 # save first because save cedes
1321 $self->save;
1322
1323 my $lock = cf::lock_acquire "map_data:" . $self->path;
1324
1327 return if $self->players; 1325 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1326 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1327 return if $self->{deny_save};
1330 1328
1331 $self->save;
1332 $self->clear; 1329 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1330 $self->in_memory (cf::MAP_SWAPPED);
1334} 1331}
1335 1332
1336sub reset_at { 1333sub reset_at {
… …
1374} 1371}
1375 1372
1376sub reset { 1373sub reset {
1377 my ($self) = @_; 1374 my ($self) = @_;
1378 1375
1376 my $lock = cf::lock_acquire "map_data:" . $self->path;
1377
1379 return if $self->players; 1378 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1379 return if $self->{path}{user_rel};#d#
1381 1380
1382 warn "resetting map ", $self->path;#d# 1381 warn "resetting map ", $self->path;#d#
1383 1382
… …
1402 1401
1403sub customise_for { 1402sub customise_for {
1404 my ($map, $ob) = @_; 1403 my ($map, $ob) = @_;
1405 1404
1406 if ($map->per_player) { 1405 if ($map->per_player) {
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1408 } 1407 }
1409 1408
1410 $map 1409 $map
1411} 1410}
1412 1411
1413sub emergency_save { 1412sub emergency_save {
1414 local $cf::FREEZE = 1; 1413 my $freeze_guard = cf::freeze_mainloop;
1415 1414
1416 warn "enter emergency map save\n"; 1415 warn "enter emergency map save\n";
1417 1416
1418 cf::sync_job { 1417 cf::sync_job {
1419 warn "begin emergency map save\n"; 1418 warn "begin emergency map save\n";
… …
1509 my $link_pos = delete $self->{_link_pos}; 1508 my $link_pos = delete $self->{_link_pos};
1510 1509
1511 unless ($map) { 1510 unless ($map) {
1512 # restore original map position 1511 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1512 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1513 $map = cf::map::find $map;
1515 1514
1516 unless ($map) { 1515 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1516 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1517 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1518 or die "FATAL: cannot load emergency map\n";
1520 } 1519 }
1521 } 1520 }
1522 1521
1523 ($x, $y) = (-1, -1) 1522 ($x, $y) = (-1, -1)
… …
1548 my ($pl) = @_; 1547 my ($pl) = @_;
1549 1548
1550 # try to abort aborted map switching on player login :) 1549 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1550 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1551 if ($pl->ob->{_link_pos}) {
1552
1553 $pl->ob->enter_link; 1553 $pl->ob->enter_link;
1554 cf::async { 1554 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1555 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1556 # and this sleep increases chances of the player not ending up in scorn
1557 $pl->ob->reply (undef,
1558 "There was an internal problem at your last logout, "
1559 . "the server will try to bring you to your intended destination in a second.",
1560 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1561 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1562 $pl->ob->leave_link;
1559 }; 1563 })->prio (2);
1560 } 1564 }
1561 }, 1565 },
1562); 1566);
1563 1567
1564=item $player_object->goto_map ($path, $x, $y) 1568=item $player_object->goto ($path, $x, $y)
1565 1569
1566=cut 1570=cut
1567 1571
1568sub cf::object::player::goto_map { 1572sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1573 my ($self, $path, $x, $y) = @_;
1570 1574
1571 $self->enter_link; 1575 $self->enter_link;
1572 1576
1573 (cf::async { 1577 (async {
1574 $path = new cf::path $path; 1578 $path = new cf::path $path;
1575 1579
1576 my $map = cf::map::find_map $path->as_string; 1580 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1581 $map = $map->customise_for ($self) if $map;
1578 1582
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1583# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1584# if $map;
1581 1585
… …
1640 1644
1641 return unless $self->type == cf::PLAYER; 1645 return unless $self->type == cf::PLAYER;
1642 1646
1643 $self->enter_link; 1647 $self->enter_link;
1644 1648
1645 (cf::async { 1649 (async {
1650 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1651 unless (eval {
1647 prepare_random_map $exit 1652 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1653 if $exit->slaying eq "/!";
1649 1654
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1656 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1657
1653 1; 1658 1;
1654 }) { 1659 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1660 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1661 . "I'll try to bring you back to the map you were before. "
… …
1713 on_reply => sub { 1718 on_reply => sub {
1714 my ($ns, $msg) = @_; 1719 my ($ns, $msg) = @_;
1715 1720
1716 # this weird shuffling is so that direct followup queries 1721 # this weird shuffling is so that direct followup queries
1717 # get handled first 1722 # get handled first
1718 my $queue = delete $ns->{query_queue}; 1723 my $queue = delete $ns->{query_queue}
1724 or return; # be conservative, not sure how that can happen, but we saw a crash here
1719 1725
1720 (shift @$queue)->[1]->($msg); 1726 (shift @$queue)->[1]->($msg);
1721 1727
1722 push @{ $ns->{query_queue} }, @$queue; 1728 push @{ $ns->{query_queue} }, @$queue;
1723 1729
… …
1729 } 1735 }
1730 } 1736 }
1731 }, 1737 },
1732); 1738);
1733 1739
1734=item $client->coro (\&cb) 1740=item $client->async (\&cb)
1735 1741
1736Create a new coroutine, running the specified callback. The coroutine will 1742Create a new coroutine, running the specified callback. The coroutine will
1737be automatically cancelled when the client gets destroyed (e.g. on logout, 1743be automatically cancelled when the client gets destroyed (e.g. on logout,
1738or loss of connection). 1744or loss of connection).
1739 1745
1740=cut 1746=cut
1741 1747
1742sub cf::client::coro { 1748sub cf::client::async {
1743 my ($self, $cb) = @_; 1749 my ($self, $cb) = @_;
1744 1750
1745 my $coro = &cf::async ($cb); 1751 my $coro = &Coro::async ($cb);
1746 1752
1747 $coro->on_destroy (sub { 1753 $coro->on_destroy (sub {
1748 delete $self->{_coro}{$coro+0}; 1754 delete $self->{_coro}{$coro+0};
1749 }); 1755 });
1750 1756
… …
1985 open my $fh, "<:utf8", cf::confdir . "/config" 1991 open my $fh, "<:utf8", cf::confdir . "/config"
1986 or return; 1992 or return;
1987 1993
1988 local $/; 1994 local $/;
1989 *CFG = YAML::Syck::Load <$fh>; 1995 *CFG = YAML::Syck::Load <$fh>;
1996
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998
1999 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2000 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2001
2002 if (exists $CFG{mlockall}) {
2003 eval {
2004 $CFG{mlockall} ? &mlockall : &munlockall
2005 and die "WARNING: m(un)lockall failed: $!\n";
2006 };
2007 warn $@ if $@;
2008 }
1990} 2009}
1991 2010
1992sub main { 2011sub main {
1993 # we must not ever block the main coroutine 2012 # we must not ever block the main coroutine
1994 local $Coro::idle = sub { 2013 local $Coro::idle = sub {
1995 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2014 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1996 (Coro::unblock_sub {
1997 Event::one_event; 2015 async { Event::one_event };
1998 })->();
1999 }; 2016 };
2000 2017
2001 cfg_load; 2018 cfg_load;
2002 db_load; 2019 db_load;
2003 load_extensions; 2020 load_extensions;
… …
2014 return; 2031 return;
2015 } 2032 }
2016 2033
2017 warn "reloading..."; 2034 warn "reloading...";
2018 2035
2019 local $FREEZE = 1; 2036 my $guard = freeze_mainloop;
2020 cf::emergency_save; 2037 cf::emergency_save;
2021 2038
2022 eval { 2039 eval {
2023 # if anything goes wrong in here, we should simply crash as we already saved 2040 # if anything goes wrong in here, we should simply crash as we already saved
2024 2041
… …
2160 reentrant => 0, 2177 reentrant => 0,
2161 prio => 0, 2178 prio => 0,
2162 at => $NEXT_TICK || $TICK, 2179 at => $NEXT_TICK || $TICK,
2163 data => WF_AUTOCANCEL, 2180 data => WF_AUTOCANCEL,
2164 cb => sub { 2181 cb => sub {
2165 unless ($FREEZE) {
2166 cf::server_tick; # one server iteration 2182 cf::server_tick; # one server iteration
2167 $RUNTIME += $TICK; 2183 $RUNTIME += $TICK;
2168 }
2169
2170 $NEXT_TICK += $TICK; 2184 $NEXT_TICK += $TICK;
2171 2185
2172 # if we are delayed by four ticks or more, skip them all 2186 # if we are delayed by four ticks or more, skip them all
2173 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2174 2188

Diff Legend

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